Refactoring: tests.