Fixing integration tests that uses the new oauth screen