put everything back, then force ordering of tests