Improvements and fixes for the common load-data x-test benchmarks

What about ServiceCleaner?