I see a lot of tests, my god there are lot of tests. Also couple of features/betterifys
Merge pull request #1703 from UniversityOfHelsinkiCS/trunk Prettier and refactoring
Merge pull request #1703 from UniversityOfHelsinkiCS/trunk Prettier and refactoring