Fix broken tests
Make it easier to run just a single test case from the main suite (app1)