Made some changes to App to make it easier to test.