Small work on refactoring the tests.