- removed references to TestHelper
- refactored MockApp to make the interaction the same as the current testing api