Changes to make the TestActivity the main testing activity