Tidying to ensure tests run after refactoring.