Refactor acceptance tests to use the web service clients