Fixing acceptance tests.