Refactoring the tests.