Bug 937532 - Migrate calendar tests to use an app object, review fix