Align test with opcode update