Testing and refactoring.