Merge "Remove unnecessary setting from CredentialsTests"