Updated acceptance tests
Updated acceptance tests