Fix import-related test errors.