FEATURE Made import_client testable.