Fix the TEST_ORDERED and -r thing with a Kludge