disabled opcode prediction macros
updated tests to reflect some minor changes in function ordering