Begin writing tests
Merge branch 'master' of https://github.com/JonathanThunberg/Dat076