Make services testable again