Testing done after refactoring.