Second test and refactoring