Merge "Tests can't call resetGlobalServices()"