Merge "Add tests for application credentials"