Attempt to fix acceptance tests.