Updated acceptance tests.