Tests: Refactoring.