Better unit tests
Merge branch 'master' of github.com:SmallRoomLabs/troll-avg