Changed order of test classes for improved readability