Merging bytemonster's unit tests
Merge branch 'next' of github.com:Hackademic/hackademic into next