Relaxed a bit the opcode checks to make the test less sensitive to changes resulting in opcode numbering.