Fix part of the acceptance tests