Updating functional tests to restore CallContextServiceLocator.Locator.S...

Other name changes to get tests to work on Mono.