#5: Test refactoring