** Fixed tests to work with oauth2