Update failing tests, use new api_version option