#7 - refactor i nowe testy
#9 - start