80% done - Acceptance tests
Merge branch 'developer-acceptancetests' of https://github.com/djkirby/wpi-suite-tng into developer-acceptancetests