test instr support, tests, fixes