Merge "Add tests to cover service_profile"