fix b5aa10c
rearrange OP_TEST OP_TESTSET pass tests same as last commit
format some tabs and spaces