Merge "App specific test"