Fix broken acceptance tests