#8: Refactoring the tests.