First test and first refactoring