Update to acceptance tests