Renaming and refactoring the tests.