Update test suite to have test ordering working correctly.