Issue #2911498 by Mile23, mfernea, alexpott, dawehner, catch: Make TestServiceProvider more readable (cleanup)