Fixed up test failures in light of the recent changes.
Merge branch 'refactor' of https://github.com/NottingHack/hms into refactor