Fix services acceptance tests