Testing after refactoring