diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4cbfdda879e..6537db6dd73 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,19 +1,24 @@
-files: ^pyaedt/
+files: |
+    (?x)(
+        ^pyaedt/|
+        _unittest/
+    )
 exclude: |
     (?x)(
         ^pyaedt/rpc/|
         ^pyaedt/third_party/|
-        pyaedt/conftest.py
+        pyaedt/conftest.py|
+        _unittest/example_models/
     )
 repos:
 - repo: https://github.com/psf/black
-  rev: 21.12b0
+  rev: 22.1.0
   hooks:
   - id: black
     args:
       - --line-length=120
 - repo: https://github.com/asottile/reorder_python_imports
-  rev: v2.6.0
+  rev: v3.0.1
   hooks:
   - id: reorder-python-imports
     args: 
diff --git a/_unittest/conftest.py b/_unittest/conftest.py
index f00921d7f1e..726591d5fc4 100644
--- a/_unittest/conftest.py
+++ b/_unittest/conftest.py
@@ -17,14 +17,17 @@
 }
 
 """
-import tempfile
+import gc
+import json
 import os
 import shutil
-import json
-import gc
 import sys
-from pyaedt.generic.general_methods import is_ironpython, inside_desktop, generate_unique_name
+import tempfile
+
 from pyaedt import settings
+from pyaedt.generic.general_methods import generate_unique_name
+from pyaedt.generic.general_methods import inside_desktop
+from pyaedt.generic.general_methods import is_ironpython
 
 log_path = os.path.join(tempfile.gettempdir(), "test.log")
 if os.path.exists(os.path.join(tempfile.gettempdir(), "test.log")):
diff --git a/_unittest/launch_desktop_tests.py b/_unittest/launch_desktop_tests.py
index efc0a9d2572..3f53eae1356 100644
--- a/_unittest/launch_desktop_tests.py
+++ b/_unittest/launch_desktop_tests.py
@@ -1,5 +1,14 @@
 # Import required modules
-from pyaedt import Hfss, Maxwell2d, Maxwell3d, Q2d, Q3d, TwinBuilder, Hfss3dLayout, Icepak, Circuit, Mechanical
+from pyaedt import Circuit
+from pyaedt import Hfss
+from pyaedt import Hfss3dLayout
+from pyaedt import Icepak
+from pyaedt import Maxwell2d
+from pyaedt import Maxwell3d
+from pyaedt import Mechanical
+from pyaedt import Q2d
+from pyaedt import Q3d
+from pyaedt import TwinBuilder
 
 
 def run_desktop_tests():
diff --git a/_unittest/test_00_EDB.py b/_unittest/test_00_EDB.py
index e1bb673fd55..c1055babdf9 100644
--- a/_unittest/test_00_EDB.py
+++ b/_unittest/test_00_EDB.py
@@ -1,13 +1,12 @@
-import os
 import math
+import os
 import time
 
-# Setup paths for module imports
-
-# Import required modules
 from pyaedt import Edb
 from pyaedt.edb_core.components import resistor_value_parser
 
+# Setup paths for module imports
+# Import required modules
 
 test_project_name = "Galileo_edb"
 bom_example = "bom_example.csv"
diff --git a/_unittest/test_00_GeometryOperators.py b/_unittest/test_00_GeometryOperators.py
index c44eabf038a..796e8803e71 100644
--- a/_unittest/test_00_GeometryOperators.py
+++ b/_unittest/test_00_GeometryOperators.py
@@ -1,6 +1,7 @@
 import math
 
 import clr
+
 from pyaedt.modeler.GeometryOperators import GeometryOperators as go
 
 clr.AddReference("System.Collections")
diff --git a/_unittest/test_00_downloads.py b/_unittest/test_00_downloads.py
index 20d09ec69f2..afb6a15cdf1 100644
--- a/_unittest/test_00_downloads.py
+++ b/_unittest/test_00_downloads.py
@@ -1,9 +1,9 @@
 # Import required modules
-import tempfile
 import os
+import tempfile
 
-from pyaedt.examples import downloads
 from _unittest.conftest import BasisTest
+from pyaedt.examples import downloads
 
 
 class TestClass(BasisTest, object):
diff --git a/_unittest/test_01_Design.py b/_unittest/test_01_Design.py
index 6d9fb061745..6617965bd68 100644
--- a/_unittest/test_01_Design.py
+++ b/_unittest/test_01_Design.py
@@ -1,11 +1,11 @@
 # standard imports
 import os
 
-# Import required modules
-from pyaedt import Desktop, get_pyaedt_app
-
-# Setup paths for module imports
-from _unittest.conftest import desktop_version, local_path, BasisTest
+from _unittest.conftest import BasisTest
+from _unittest.conftest import desktop_version
+from _unittest.conftest import local_path
+from pyaedt import Desktop
+from pyaedt import get_pyaedt_app
 
 try:
     import pytest  # noqa: F401
diff --git a/_unittest/test_02_2D_modeler.py b/_unittest/test_02_2D_modeler.py
index ea4550fe08b..3d568ffce0c 100644
--- a/_unittest/test_02_2D_modeler.py
+++ b/_unittest/test_02_2D_modeler.py
@@ -2,11 +2,13 @@
 import math
 import os
 
-from pyaedt.generic.general_methods import isclose, is_ironpython
+from _unittest.conftest import BasisTest
+from _unittest.conftest import config
+from pyaedt.generic.general_methods import is_ironpython
+from pyaedt.generic.general_methods import isclose
 from pyaedt.maxwell import Maxwell2d
 
 # Setup paths for module imports
-from _unittest.conftest import BasisTest, config
 
 try:
     import pytest  # noqa: F401
diff --git a/_unittest/test_02_3D_modeler.py b/_unittest/test_02_3D_modeler.py
index 3a28c12ed39..5b6580474a1 100644
--- a/_unittest/test_02_3D_modeler.py
+++ b/_unittest/test_02_3D_modeler.py
@@ -1,7 +1,8 @@
 # Setup paths for module imports
-from _unittest.conftest import BasisTest, pyaedt_unittest_check_desktop_error
-from pyaedt.modeler.Modeler import FaceCoordinateSystem
+from _unittest.conftest import BasisTest
+from _unittest.conftest import pyaedt_unittest_check_desktop_error
 from pyaedt.application.Design import DesignCache
+from pyaedt.modeler.Modeler import FaceCoordinateSystem
 
 try:
     import pytest  # noqa: F401
diff --git a/_unittest/test_03_Materials.py b/_unittest/test_03_Materials.py
index f3ea7ec48ec..aea747109e8 100644
--- a/_unittest/test_03_Materials.py
+++ b/_unittest/test_03_Materials.py
@@ -1,12 +1,13 @@
 # standard imports
 import os
 
-# Import required modules
-from pyaedt import Icepak, Maxwell3d
-from pyaedt.modules.Material import MatProperties, SurfMatProperties
-
-# Setup paths for module imports
-from _unittest.conftest import desktop_version, local_path, BasisTest
+from _unittest.conftest import BasisTest
+from _unittest.conftest import desktop_version
+from _unittest.conftest import local_path
+from pyaedt import Icepak
+from pyaedt import Maxwell3d
+from pyaedt.modules.Material import MatProperties
+from pyaedt.modules.Material import SurfMatProperties
 
 try:
     import pytest  # noqa: F401
diff --git a/_unittest/test_05_Mesh.py b/_unittest/test_05_Mesh.py
index 5f4defce098..f3fad408078 100644
--- a/_unittest/test_05_Mesh.py
+++ b/_unittest/test_05_Mesh.py
@@ -1,8 +1,8 @@
 # Import required modules
+from _unittest.conftest import BasisTest
+from _unittest.conftest import desktop_version
 from pyaedt import Maxwell3d
 
-from _unittest.conftest import desktop_version, BasisTest
-
 try:
     import pytest  # noqa: F401
 except ImportError:
diff --git a/_unittest/test_06_MessageManager.py b/_unittest/test_06_MessageManager.py
index 7295f780617..654ab8d3044 100644
--- a/_unittest/test_06_MessageManager.py
+++ b/_unittest/test_06_MessageManager.py
@@ -1,11 +1,10 @@
 # Setup paths for module imports
 import logging
 
+from _unittest.conftest import BasisTest
+from _unittest.conftest import config
 from pyaedt.application.MessageManager import AEDTMessageManager
 
-# Import required modules
-from _unittest.conftest import config, BasisTest
-
 try:
     import pytest
 except ImportError:
diff --git a/_unittest/test_07_Object3D.py b/_unittest/test_07_Object3D.py
index f90562affd5..2688bbb901a 100644
--- a/_unittest/test_07_Object3D.py
+++ b/_unittest/test_07_Object3D.py
@@ -1,11 +1,12 @@
 # standard imports
 import math
 
-# Import required modules
-from pyaedt.generic.general_methods import isclose, time_fn
-from pyaedt.modeler.Object3d import FacePrimitive, _to_boolean, _uname
-
 from _unittest.conftest import BasisTest
+from pyaedt.generic.general_methods import isclose
+from pyaedt.generic.general_methods import time_fn
+from pyaedt.modeler.Object3d import _to_boolean
+from pyaedt.modeler.Object3d import _uname
+from pyaedt.modeler.Object3d import FacePrimitive
 
 
 class TestClass(BasisTest, object):
diff --git a/_unittest/test_09_Primitives2D.py b/_unittest/test_09_Primitives2D.py
index 5241fd79d1b..94ea80c36c9 100644
--- a/_unittest/test_09_Primitives2D.py
+++ b/_unittest/test_09_Primitives2D.py
@@ -1,11 +1,12 @@
 #!/ekm/software/anaconda3/bin/python
 # Import required modules
+from _unittest.conftest import BasisTest
+from _unittest.conftest import pyaedt_unittest_check_desktop_error
 from pyaedt import Maxwell2d
-from pyaedt.modeler.Primitives import Polyline
 from pyaedt.application.Design import DesignCache
+from pyaedt.modeler.Primitives import Polyline
 
 # Setup paths for module imports
-from _unittest.conftest import BasisTest, pyaedt_unittest_check_desktop_error
 
 try:
     import pytest  # noqa: F401
diff --git a/_unittest/test_09_VariableManager.py b/_unittest/test_09_VariableManager.py
index d196d80f148..ff546d4527b 100644
--- a/_unittest/test_09_VariableManager.py
+++ b/_unittest/test_09_VariableManager.py
@@ -1,13 +1,13 @@
 # Setup paths for module imports
-from __future__ import division
+from __future__ import division  # noreorder
 import math
 
-from pyaedt.application.Variables import Variable
+from _unittest.conftest import BasisTest
 from pyaedt.application.Variables import decompose_variable_value
+from pyaedt.application.Variables import Variable
 from pyaedt.generic.general_methods import isclose
 
 # Import required modules
-from _unittest.conftest import BasisTest
 
 try:
     import pytest  # noqa: F401
diff --git a/_unittest/test_11_Setup.py b/_unittest/test_11_Setup.py
index 8a7b3f97cd5..32b29cfb1f5 100644
--- a/_unittest/test_11_Setup.py
+++ b/_unittest/test_11_Setup.py
@@ -1,10 +1,9 @@
 # standard imports
-
 # Setup paths for module imports
 from _unittest.conftest import BasisTest
+from pyaedt import Circuit
 
 # Import required modules
-from pyaedt import Circuit
 
 test_project_name = "coax_setup"
 
diff --git a/_unittest/test_12_PostProcessing.py b/_unittest/test_12_PostProcessing.py
index c583d17417a..54e1fefda5c 100644
--- a/_unittest/test_12_PostProcessing.py
+++ b/_unittest/test_12_PostProcessing.py
@@ -1,13 +1,11 @@
 # standard imports
 import os
 
-# Import required modules
+from _unittest.conftest import BasisTest
+from _unittest.conftest import config
 from pyaedt import Hfss
 from pyaedt.generic.general_methods import is_ironpython
 
-# Setup paths for module imports
-from _unittest.conftest import config, BasisTest
-
 try:
     import pytest
 except ImportError:
diff --git a/_unittest/test_13_LoadAEDTFile.py b/_unittest/test_13_LoadAEDTFile.py
index bd428292ee1..5174a74c5d3 100644
--- a/_unittest/test_13_LoadAEDTFile.py
+++ b/_unittest/test_13_LoadAEDTFile.py
@@ -1,13 +1,13 @@
 # Setup paths for module imports
-from _unittest.conftest import local_path, BasisTest
-
-# Import required modules
-from pyaedt.generic.LoadAEDTFile import load_entire_aedt_file
 import base64
 import filecmp
 import os
 import sys
 
+from _unittest.conftest import BasisTest
+from _unittest.conftest import local_path
+from pyaedt.generic.LoadAEDTFile import load_entire_aedt_file
+
 
 def _write_jpg(design_info, scratch):
     """writes the jpg Image64 property of the design info
diff --git a/_unittest/test_14_AedtLogger.py b/_unittest/test_14_AedtLogger.py
index cde0d5c4a6b..1fdae2454b1 100644
--- a/_unittest/test_14_AedtLogger.py
+++ b/_unittest/test_14_AedtLogger.py
@@ -1,10 +1,10 @@
 # Setup paths for module imports
-import tempfile
-import os
 import io
 import logging
+import os
 import shutil
 import sys
+import tempfile
 
 try:
     import pytest
diff --git a/_unittest/test_15_ibs_reader.py b/_unittest/test_15_ibs_reader.py
index 2d0b9c93381..43d27ced5d8 100644
--- a/_unittest/test_15_ibs_reader.py
+++ b/_unittest/test_15_ibs_reader.py
@@ -1,8 +1,9 @@
 import os
 
-from pyaedt.generic import ibis_reader
+from _unittest.conftest import BasisTest
+from _unittest.conftest import local_path
 from pyaedt import Circuit
-from _unittest.conftest import local_path, BasisTest
+from pyaedt.generic import ibis_reader
 
 
 class TestClass(BasisTest, object):
diff --git a/_unittest/test_17_SBR.py b/_unittest/test_17_SBR.py
index 38c8bc1be3e..5106c89467a 100644
--- a/_unittest/test_17_SBR.py
+++ b/_unittest/test_17_SBR.py
@@ -1,12 +1,10 @@
 import os
 
-# Import required modules
-
+from _unittest.conftest import BasisTest
+from _unittest.conftest import desktop_version
+from _unittest.conftest import local_path
 from pyaedt import Hfss
 
-# Setup paths for module imports
-from _unittest.conftest import local_path, BasisTest, desktop_version
-
 try:
     import pytest  # noqa: F401
 except ImportError:
diff --git a/_unittest/test_21_Circuit.py b/_unittest/test_21_Circuit.py
index fe55a9e0d44..f9a5d7a37cc 100644
--- a/_unittest/test_21_Circuit.py
+++ b/_unittest/test_21_Circuit.py
@@ -1,12 +1,12 @@
 import os
 import time
 
-# Import required modules
-from pyaedt import Circuit
-from pyaedt.generic.TouchstoneParser import read_touchstone
+from _unittest.conftest import BasisTest
+from _unittest.conftest import config
+from _unittest.conftest import local_path
+from pyaedt import Circuit  # Setup paths for module imports
+from pyaedt.generic.TouchstoneParser import read_touchstone  # Setup paths for module imports
 
-# Setup paths for module imports
-from _unittest.conftest import local_path, config, BasisTest
 
 try:
     import pytest  # noqa: F401
diff --git a/_unittest/test_22_Circuit_DynamicLink.py b/_unittest/test_22_Circuit_DynamicLink.py
index d14d780288d..059e3a730e3 100644
--- a/_unittest/test_22_Circuit_DynamicLink.py
+++ b/_unittest/test_22_Circuit_DynamicLink.py
@@ -1,8 +1,16 @@
 # standard imports
 import os
-from _unittest.conftest import local_path, config, desktop_version, BasisTest
 
-from pyaedt import Circuit, Q2d, Q3d, Hfss, settings
+from _unittest.conftest import BasisTest
+from _unittest.conftest import config
+from _unittest.conftest import desktop_version
+from _unittest.conftest import local_path
+from pyaedt import Circuit
+from pyaedt import Hfss
+from pyaedt import Q2d
+from pyaedt import Q3d
+from pyaedt import settings
+
 
 try:
     import pytest
diff --git a/_unittest/test_26_emit.py b/_unittest/test_26_emit.py
index 124d49bf4a5..fac98562870 100644
--- a/_unittest/test_26_emit.py
+++ b/_unittest/test_26_emit.py
@@ -1,8 +1,9 @@
 # Import required modules
+from _unittest.conftest import BasisTest
+from _unittest.conftest import config
 from pyaedt import Emit
-from pyaedt.modeler.PrimitivesEmit import EmitComponent, EmitComponents
-
-from _unittest.conftest import config, BasisTest
+from pyaedt.modeler.PrimitivesEmit import EmitComponent
+from pyaedt.modeler.PrimitivesEmit import EmitComponents
 
 try:
     import pytest
diff --git a/_unittest/test_27_Maxwell2D.py b/_unittest/test_27_Maxwell2D.py
index 526814837fb..31893ab02c4 100644
--- a/_unittest/test_27_Maxwell2D.py
+++ b/_unittest/test_27_Maxwell2D.py
@@ -1,15 +1,14 @@
 #!/ekm/software/anaconda3/bin/python
-
 # Standard imports
 import filecmp
 import os
 
-# Import required modules
+from _unittest.conftest import BasisTest
+from _unittest.conftest import local_path
+from _unittest.conftest import pyaedt_unittest_check_desktop_error
 from pyaedt import Maxwell2d
-from pyaedt.generic.constants import SOLUTIONS
 from pyaedt.application.Design import DesignCache
-
-from _unittest.conftest import BasisTest, local_path, pyaedt_unittest_check_desktop_error
+from pyaedt.generic.constants import SOLUTIONS
 
 try:
     import pytest  # noqa: F401
diff --git a/_unittest/test_28_Maxwell3D.py b/_unittest/test_28_Maxwell3D.py
index 97ad084cb62..3a37f476946 100644
--- a/_unittest/test_28_Maxwell3D.py
+++ b/_unittest/test_28_Maxwell3D.py
@@ -1,9 +1,10 @@
 # Setup paths for module imports
-from _unittest.conftest import desktop_version, local_path, BasisTest
 import os
 import tempfile
 
-# Import required modules
+from _unittest.conftest import BasisTest
+from _unittest.conftest import desktop_version
+from _unittest.conftest import local_path
 from pyaedt import Maxwell3d
 from pyaedt.generic.constants import SOLUTIONS
 
diff --git a/_unittest/test_29_Mechanical.py b/_unittest/test_29_Mechanical.py
index 2946dae4c6e..eb423c8f0be 100644
--- a/_unittest/test_29_Mechanical.py
+++ b/_unittest/test_29_Mechanical.py
@@ -1,10 +1,11 @@
 import os
 
-# Setup paths for module imports
-from _unittest.conftest import desktop_version, config, BasisTest
-
-# Import required modules
-from pyaedt import Hfss, Mechanical, Icepak
+from _unittest.conftest import BasisTest  # Setup paths for module imports
+from _unittest.conftest import config  # Setup paths for module imports
+from _unittest.conftest import desktop_version  # Setup paths for module imports
+from pyaedt import Hfss
+from pyaedt import Icepak
+from pyaedt import Mechanical
 
 try:
     import pytest
diff --git a/_unittest/test_30_Q2D.py b/_unittest/test_30_Q2D.py
index 2bfc696df48..61914f773e3 100644
--- a/_unittest/test_30_Q2D.py
+++ b/_unittest/test_30_Q2D.py
@@ -1,9 +1,8 @@
 import os
 
-# Setup paths for module imports
-from _unittest.conftest import local_path, desktop_version, BasisTest
-
-# Import required modules
+from _unittest.conftest import BasisTest
+from _unittest.conftest import desktop_version
+from _unittest.conftest import local_path
 from pyaedt import Q2d
 
 test_project_name = "coax_Q2D"
diff --git a/_unittest/test_31_Q3D.py b/_unittest/test_31_Q3D.py
index 62dd1f66d60..06bec272ef7 100644
--- a/_unittest/test_31_Q3D.py
+++ b/_unittest/test_31_Q3D.py
@@ -1,9 +1,8 @@
 import os
 
-# Setup paths for module imports
-from _unittest.conftest import local_path, desktop_version, BasisTest
-
-# Import required modules
+from _unittest.conftest import BasisTest
+from _unittest.conftest import desktop_version
+from _unittest.conftest import local_path
 from pyaedt import Q3d
 
 test_project_name = "coax_Q3D"
diff --git a/_unittest/test_32_RMxprt.py b/_unittest/test_32_RMxprt.py
index 3758a7e491b..1b5122fc7dc 100644
--- a/_unittest/test_32_RMxprt.py
+++ b/_unittest/test_32_RMxprt.py
@@ -1,9 +1,6 @@
 import os
 
-# Setup paths for module imports
 from _unittest.conftest import BasisTest
-
-# Import required modules
 from pyaedt import Rmxprt
 
 test_project_name = "motor"
diff --git a/_unittest/test_34_TwinBuilder.py b/_unittest/test_34_TwinBuilder.py
index 029c0e9f176..cdbb8388dd3 100644
--- a/_unittest/test_34_TwinBuilder.py
+++ b/_unittest/test_34_TwinBuilder.py
@@ -1,9 +1,9 @@
 # Setup paths for module imports
-from _unittest.conftest import local_path, BasisTest
+import os
 
-# Import required modules
+from _unittest.conftest import BasisTest
+from _unittest.conftest import local_path
 from pyaedt import TwinBuilder
-import os
 
 
 class TestClass(BasisTest, object):
diff --git a/_unittest/test_35_MaxwellCircuit.py b/_unittest/test_35_MaxwellCircuit.py
index 95ec3e263b8..5b34dccb326 100644
--- a/_unittest/test_35_MaxwellCircuit.py
+++ b/_unittest/test_35_MaxwellCircuit.py
@@ -1,7 +1,5 @@
 # Setup paths for module imports
 from _unittest.conftest import BasisTest
-
-# Import required modules
 from pyaedt import MaxwellCircuit
 
 
diff --git a/_unittest/test_41_3dlayout_modeler.py b/_unittest/test_41_3dlayout_modeler.py
index 35c6fd0de65..364981002ca 100644
--- a/_unittest/test_41_3dlayout_modeler.py
+++ b/_unittest/test_41_3dlayout_modeler.py
@@ -1,13 +1,13 @@
 import os
 import time
 
-# Import required modules
+from _unittest.conftest import BasisTest
+from _unittest.conftest import is_ironpython
+from _unittest.conftest import local_path
+from _unittest.conftest import scratch_path
 from pyaedt import Hfss3dLayout
 from pyaedt.generic.filesystem import Scratch
 
-# Setup paths for module imports
-from _unittest.conftest import scratch_path, local_path, BasisTest, is_ironpython
-
 try:
     import pytest  # noqa: F401
 except ImportError:
diff --git a/_unittest/test_98_Icepak.py b/_unittest/test_98_Icepak.py
index 379963195fc..45a6332d707 100644
--- a/_unittest/test_98_Icepak.py
+++ b/_unittest/test_98_Icepak.py
@@ -1,12 +1,13 @@
 # standard imports
 import os
 
-# Import required modules
+from _unittest.conftest import BasisTest
+from _unittest.conftest import config
+from _unittest.conftest import desktop_version
+from _unittest.conftest import local_path
+from _unittest.conftest import scratch_path
 from pyaedt import Icepak
 
-# Setup paths for module imports
-from _unittest.conftest import local_path, scratch_path, desktop_version, config, BasisTest
-
 try:
     import pytest  # noqa: F401
 except ImportError: