Changes to TestApp