Refactors code so that tests pass #11

Closed zygmuntszpak closed 5 years ago