Merge "Give access to CredClient in tests"