Restore original test code
Update comment for saving mask flag/opcode.