Added tests and fixed more broken tests. Still can't figure out certain broken tests...
fixed merge conflicts
Merge branch 'dev-set3-iteration5' of https://github.com/333fred/wpi-suite-tng into dev-set3-iteration5