Trying to fix acceptance tests