Rename the tests and sort them so it's clearer what they're testing for.