Updated ClientCredentials to properly include scopes
Updated unit tests