Fix test failures due to windows_service_manager...