OAuth2 service tests updated to support CCNGv2