Fixes most failing tests. bjmcmorran
Merge branch 'Iteration-5-dev' of https://github.com/alexbragdon/wpi-suite into Iteration-5-dev