Fix the tests to run consistently