Fix acceptance tests