Had to slightly modify files above to pass automated tests. I can see that it is a common issue in our cohort :)