Fixing acceptance tests