fix I type opcodes, readded test2 from last submit (detected buggy compilers)