Updated acceptance tests