Merge "Fix code coverage for apps"