Merge "Make the API tests compatible with scoped tokens"