zrrichards: Fix commented-out tests.
Merge branch 'Iteration-6-dev' of https://github.com/alexbragdon/wpi-suite into Iteration-6-dev