Refactor tests to remove patching of ReconnectingClientService class.