rename validScopes to scopes for consistency
work on scopes in apigee
fix sample test configs