First stab at the ORDERED_TEST and -r thing

Maybe a macro two wrap setting the pre test hook would be nice?