Clean up the ServiceProvisioner and its tests