Uses RPC to delete oauth2 tokens in tests
Handles token errors better