I would like to keep the changes to make the test cases easier to follow. Now the order of tests in the code matches what's in the suite.