Update acceptance tests to use new api