Merge "Call resetServices() when setting globals in tests"