diff --git a/rdmo/core/imports.py b/rdmo/core/imports.py
index 2e88d8ce0d..1bc9658d30 100644
--- a/rdmo/core/imports.py
+++ b/rdmo/core/imports.py
@@ -189,8 +189,7 @@ def set_foreign_field(instance, field_name, element, uploaded_uris=None, origina
         return
 
     if 'uri' not in foreign_element:
-        message = 'Foreign model can not be assigned on {instance_model}.{field_name} {instance_uri} due to missing uri.'.format(
-            # noqa: E501
+        message = 'Foreign model can not be assigned on {instance_model}.{field_name} {instance_uri} due to missing uri.'.format(  # noqa: E501
             instance_model=instance._meta.object_name,
             instance_uri=element.get('uri'),
             field_name=field_name
@@ -226,8 +225,7 @@ def set_foreign_field(instance, field_name, element, uploaded_uris=None, origina
                                               _foreign_uri,
                                               original=original)
     except ValueError:
-        message = '{foreign_model} {foreign_uri} can not be assigned on {instance_model}.{field_name} {instance_uri} .'.format(
-            # noqa: E501
+        message = '{foreign_model} {foreign_uri} can not be assigned on {instance_model}.{field_name} {instance_uri} .'.format(  # noqa: E501
             foreign_model=foreign_model._meta.object_name,
             foreign_uri=foreign_uri,
             instance_model=instance._meta.object_name,
diff --git a/rdmo/management/tests/helpers_import_elements.py b/rdmo/management/tests/helpers_import_elements.py
index 2646098e1d..53c9e6d649 100644
--- a/rdmo/management/tests/helpers_import_elements.py
+++ b/rdmo/management/tests/helpers_import_elements.py
@@ -2,7 +2,7 @@
 from functools import partial
 from typing import Dict, List, Optional, Tuple, Union
 
-from rdmo.core.imports import track_changes_on_element, ELEMENT_DIFF_FIELD_NAME, NEW_DATA_FIELD, CURRENT_DATA_FIELD
+from rdmo.core.imports import CURRENT_DATA_FIELD, ELEMENT_DIFF_FIELD_NAME, NEW_DATA_FIELD, track_changes_on_element
 from rdmo.management.imports import _initialize_import_element_dict
 
 UPDATE_FIELD_FUNCS = {
diff --git a/rdmo/management/tests/test_import_options.py b/rdmo/management/tests/test_import_options.py
index 9c763d4049..d0b9a0aab0 100644
--- a/rdmo/management/tests/test_import_options.py
+++ b/rdmo/management/tests/test_import_options.py
@@ -2,14 +2,14 @@
 
 import pytest
 
-from rdmo.core.imports import ELEMENT_DIFF_FIELD_NAME, NEW_DATA_FIELD, CURRENT_DATA_FIELD
+from rdmo.core.imports import CURRENT_DATA_FIELD, ELEMENT_DIFF_FIELD_NAME, NEW_DATA_FIELD
 from rdmo.management.imports import import_elements
 from rdmo.options.models import Option, OptionSet
 
 from .helpers_import_elements import (
     _test_helper_change_fields_elements,
     _test_helper_filter_updated_and_changed,
-    get_changed_elements
+    get_changed_elements,
 )
 from .helpers_models import delete_all_objects
 from .helpers_xml import read_xml_and_parse_to_elements
@@ -98,11 +98,12 @@ def test_update_optionsets_from_changed_xml(db, settings):
     assert len([i for i in  changed_elements.values() if i]) == 5
 
     # change the order of the options, as in the xml
-    optionset_element = [i for i in imported_elements_1 if i['uri'] == test_optionset['original']['uri']][0]
-    test_optionset_changed_options = test_optionset['original']['options'][::-1]  # the test changes are simply the reversed order of the options
+    optionset_element = next([i for i in imported_elements_1 if i['uri'] == test_optionset['original']['uri']])
+    # the test changes are simply the reversed order of the options
+    test_optionset_changed_options = test_optionset['original']['options'][::-1]
     assert optionset_element
     assert "options" in optionset_element[ELEMENT_DIFF_FIELD_NAME]
-    assert optionset_element[ELEMENT_DIFF_FIELD_NAME]['options'][CURRENT_DATA_FIELD] == test_optionset['original']['options']
+    assert optionset_element[ELEMENT_DIFF_FIELD_NAME]['options'][CURRENT_DATA_FIELD] == test_optionset['original']['options']  # noqa: E501
     assert optionset_element[ELEMENT_DIFF_FIELD_NAME]['options'][NEW_DATA_FIELD] == test_optionset_changed_options
 
     # now save the elements_1