In the process of refactoring, building tests.