Fix up the tests in light of changes to App classes