acceptance tests fixes