updated and added various tests
Merge branch 'team1-dev' of https://github.com/cmdunkers/wpi-suite-tng into team1-dev