Project refactored after the lesson. Tests doesn't work!