finish move to oauth2, get tests to pass