diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85e2b40f9..55898c8d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased/Snapshot]
 
 ### Added
+- Formatting Spotless Groovy import order [#960](https://github.com/ie3-institute/PowerSystemDataModel/issues/960)
 
 ### Fixed
 - Fixed Couchbase integration tests that randomly failed [#755](https://github.com/ie3-institute/PowerSystemDataModel/issues/755)
diff --git a/gradle/scripts/spotless.gradle b/gradle/scripts/spotless.gradle
index 29ea009b7..7d547fb29 100644
--- a/gradle/scripts/spotless.gradle
+++ b/gradle/scripts/spotless.gradle
@@ -17,19 +17,18 @@ spotless {
 
   /* cf. https://github.com/diffplug/spotless/tree/master/plugin-gradle */
   groovy {
+    importOrder('\\#', '', 'java')
     licenseHeader ie3LicHead
     // the Groovy Eclipse formatter extends the Java Eclipse formatter,
     // so it formats Java files by default (unless `excludeJava` is used).
-    // FIXME rolled back greclipse version https://github.com/diffplug/spotless/issues/1860
-    greclipse('4.27').configFile('greclipse.properties')
+    greclipse().configFile('greclipse.properties')
     indentWithSpaces 2
   }
 
   groovyGradle {
     // same as groovy, but for .gradle (defaults to '*.gradle')
     target '*.gradle', 'gradle/scripts/*.gradle'
-    // FIXME rolled back greclipse version https://github.com/diffplug/spotless/issues/1860
-    greclipse('4.27')
+    greclipse()
     indentWithSpaces 2
   }
 
diff --git a/src/test/groovy/edu/ie3/datamodel/io/connectors/CsvFileConnectorTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/connectors/CsvFileConnectorTest.groovy
index 3b8eede71..69231768b 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/connectors/CsvFileConnectorTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/connectors/CsvFileConnectorTest.groovy
@@ -6,11 +6,11 @@
 package edu.ie3.datamodel.io.connectors
 
 import edu.ie3.datamodel.exceptions.ConnectorException
-import edu.ie3.datamodel.io.csv.CsvIndividualTimeSeriesMetaInformation
-import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.csv.CsvFileDefinition
+import edu.ie3.datamodel.io.csv.CsvIndividualTimeSeriesMetaInformation
 import edu.ie3.datamodel.io.naming.DefaultDirectoryHierarchy
 import edu.ie3.datamodel.io.naming.EntityPersistenceNamingStrategy
+import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.NodeInput
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/LineInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/LineInputFactoryTest.groovy
index 067353976..8a0ed78b6 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/LineInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/LineInputFactoryTest.groovy
@@ -5,6 +5,9 @@
  */
 package edu.ie3.datamodel.io.factory.input
 
+import static edu.ie3.util.quantities.PowerSystemUnits.METRE_PER_SECOND
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.NodeInput
@@ -19,12 +22,9 @@ import org.locationtech.jts.geom.LineString
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
+import java.time.ZonedDateTime
 import javax.measure.quantity.Dimensionless
 import javax.measure.quantity.Speed
-import java.time.ZonedDateTime
-
-import static edu.ie3.util.quantities.PowerSystemUnits.METRE_PER_SECOND
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
 
 class LineInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A LineInputFactory should contain exactly the expected class for parsing"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/NodeInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/NodeInputFactoryTest.groovy
index f9f28cafe..8fba840d1 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/NodeInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/NodeInputFactoryTest.groovy
@@ -15,8 +15,8 @@ import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 import tech.units.indriya.ComparableQuantity
 
-import javax.measure.quantity.ElectricPotential
 import java.time.ZonedDateTime
+import javax.measure.quantity.ElectricPotential
 
 class NodeInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A NodeInputFactory should contain exactly the expected class for parsing"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/Transformer2WInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/Transformer2WInputFactoryTest.groovy
index 1c12b1e27..a6e3cb3d2 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/Transformer2WInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/Transformer2WInputFactoryTest.groovy
@@ -11,9 +11,9 @@ import edu.ie3.datamodel.models.input.OperatorInput
 import edu.ie3.datamodel.models.input.connector.Transformer2WInput
 import edu.ie3.datamodel.models.input.connector.type.Transformer2WTypeInput
 import edu.ie3.datamodel.utils.Try
+import edu.ie3.test.common.GridTestData
 import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
-import edu.ie3.test.common.GridTestData
 
 import java.time.ZonedDateTime
 
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/Transformer3WInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/Transformer3WInputFactoryTest.groovy
index f518207c2..fab738f0a 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/Transformer3WInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/Transformer3WInputFactoryTest.groovy
@@ -86,4 +86,3 @@ class Transformer3WInputFactoryTest  extends Specification implements FactoryTes
     e.message == "Voltage level of node a must be greater than voltage level of node b and voltage level of node b must be greater than voltage level of node c"
   }
 }
-
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/BmInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/BmInputFactoryTest.groovy
index 04d9e40b7..48b7a5410 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/BmInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/BmInputFactoryTest.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.factory.input.participant
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.NodeInput
@@ -17,10 +19,8 @@ import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
-
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
+import javax.measure.quantity.Dimensionless
 
 class BmInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A BmInputFactory should contain exactly the expected class for parsing"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/ChpInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/ChpInputFactoryTest.groovy
index 373da8d5b..eba32b0f9 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/ChpInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/ChpInputFactoryTest.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.factory.input.participant
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.models.input.NodeInput
 import edu.ie3.datamodel.models.input.OperatorInput
@@ -18,10 +20,8 @@ import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
-
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
+import javax.measure.quantity.Dimensionless
 
 class ChpInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A ChpInputFactory should contain exactly the expected class for parsing"() {
@@ -78,4 +78,3 @@ class ChpInputFactoryTest extends Specification implements FactoryTestHelper {
     }
   }
 }
-
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EmInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EmInputFactoryTest.groovy
index ba8ae0d84..d3ad3d869 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EmInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EmInputFactoryTest.groovy
@@ -18,8 +18,8 @@ import edu.ie3.util.quantities.PowerSystemUnits
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
+import javax.measure.quantity.Dimensionless
 
 class EmInputFactoryTest extends Specification {
 
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EvInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EvInputFactoryTest.groovy
index 2d8b5c0d0..34a68ea5c 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EvInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EvInputFactoryTest.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.factory.input.participant
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.models.input.NodeInput
 import edu.ie3.datamodel.models.input.OperatorInput
@@ -16,10 +18,8 @@ import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
-
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
+import javax.measure.quantity.Dimensionless
 
 class EvInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A EvInputFactory should contain exactly the expected class for parsing"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EvcsInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EvcsInputFactoryTest.groovy
index 4f3412e23..10d2be4f1 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EvcsInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/EvcsInputFactoryTest.groovy
@@ -19,8 +19,8 @@ import edu.ie3.util.quantities.PowerSystemUnits
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
+import javax.measure.quantity.Dimensionless
 /**
  * Testing EvcsInputFactory
  *
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactoryTest.groovy
index fa7184b4b..ff5ef36a1 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/FixedFeedInInputFactoryTest.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.factory.input.participant
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.io.factory.input.NodeAssetInputEntityData
 import edu.ie3.datamodel.models.StandardUnits
@@ -17,10 +19,8 @@ import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
-
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
+import javax.measure.quantity.Dimensionless
 
 class FixedFeedInInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A FixedFeedInInputFactory should contain exactly the expected class for parsing"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/HpInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/HpInputFactoryTest.groovy
index 47316ab03..a24587257 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/HpInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/HpInputFactoryTest.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.factory.input.participant
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.models.input.NodeInput
 import edu.ie3.datamodel.models.input.OperatorInput
@@ -17,10 +19,8 @@ import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
-
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
+import javax.measure.quantity.Dimensionless
 
 class HpInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A HpInputFactory should contain exactly the expected class for parsing"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactoryTest.groovy
index cede6ac6b..910d59195 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/LoadInputFactoryTest.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.factory.input.participant
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.io.factory.input.NodeAssetInputEntityData
 import edu.ie3.datamodel.models.OperationTime
@@ -22,8 +24,6 @@ import tech.units.indriya.quantity.Quantities
 
 import javax.measure.quantity.Dimensionless
 
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
-
 class LoadInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A LoadInputFactory should contain exactly the expected class for parsing"() {
     given:
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/PvInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/PvInputFactoryTest.groovy
index 4fffbba20..a3a6d42ae 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/PvInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/PvInputFactoryTest.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.factory.input.participant
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.io.factory.input.NodeAssetInputEntityData
 import edu.ie3.datamodel.models.StandardUnits
@@ -17,10 +19,8 @@ import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
-
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
+import javax.measure.quantity.Dimensionless
 
 class PvInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A PvInputFactory should contain exactly the expected class for parsing"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/StorageInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/StorageInputFactoryTest.groovy
index da40b333d..453e294f2 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/StorageInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/StorageInputFactoryTest.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.factory.input.participant
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.models.input.NodeInput
 import edu.ie3.datamodel.models.input.OperatorInput
@@ -16,10 +18,8 @@ import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
-
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
+import javax.measure.quantity.Dimensionless
 
 class StorageInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A StorageInputFactory should contain exactly the expected class for parsing"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/WecInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/WecInputFactoryTest.groovy
index cd432e1f5..e97d47a09 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/WecInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/input/participant/WecInputFactoryTest.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.factory.input.participant
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.models.input.NodeInput
 import edu.ie3.datamodel.models.input.OperatorInput
@@ -16,10 +18,8 @@ import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Dimensionless
 import java.time.ZonedDateTime
-
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
+import javax.measure.quantity.Dimensionless
 
 class WecInputFactoryTest extends Specification implements FactoryTestHelper {
   def "A WecInputFactoryTest should contain exactly the expected class for parsing"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactoryTest.groovy
index 0248bf204..e32f91720 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactoryTest.groovy
@@ -6,11 +6,11 @@
 package edu.ie3.datamodel.io.factory.typeinput
 
 import edu.ie3.datamodel.exceptions.FactoryException
-import edu.ie3.datamodel.utils.Try
-import edu.ie3.test.helper.FactoryTestHelper
 import edu.ie3.datamodel.io.factory.SimpleEntityData
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.connector.type.LineTypeInput
+import edu.ie3.datamodel.utils.Try
+import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 
 class LineTypeInputFactoryTest extends Specification implements FactoryTestHelper {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactoryTest.groovy
index b5f40c2ac..6204419c1 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactoryTest.groovy
@@ -5,6 +5,9 @@
  */
 package edu.ie3.datamodel.io.factory.typeinput
 
+import static edu.ie3.util.quantities.PowerSystemUnits.METRE_PER_SECOND
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.FactoryException
 import edu.ie3.datamodel.io.factory.SimpleEntityData
 import edu.ie3.datamodel.models.StandardUnits
@@ -18,9 +21,6 @@ import tech.units.indriya.quantity.Quantities
 import javax.measure.quantity.Dimensionless
 import javax.measure.quantity.Speed
 
-import static edu.ie3.util.quantities.PowerSystemUnits.METRE_PER_SECOND
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
-
 class SystemParticipantTypeInputFactoryTest extends Specification implements FactoryTestHelper {
 
   def "A SystemParticipantTypeInputFactory should contain all expected classes for parsing"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactoryTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactoryTest.groovy
index d01862624..bd844da36 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactoryTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/Transformer3WTypeInputFactoryTest.groovy
@@ -6,11 +6,11 @@
 package edu.ie3.datamodel.io.factory.typeinput
 
 import edu.ie3.datamodel.exceptions.FactoryException
-import edu.ie3.datamodel.utils.Try
-import edu.ie3.test.helper.FactoryTestHelper
 import edu.ie3.datamodel.io.factory.SimpleEntityData
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.connector.type.Transformer3WTypeInput
+import edu.ie3.datamodel.utils.Try
+import edu.ie3.test.helper.FactoryTestHelper
 import spock.lang.Specification
 
 class Transformer3WTypeInputFactoryTest extends Specification implements FactoryTestHelper {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/naming/EntityPersistenceNamingStrategyTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/naming/EntityPersistenceNamingStrategyTest.groovy
index f6319e151..f3e89647b 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/naming/EntityPersistenceNamingStrategyTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/naming/EntityPersistenceNamingStrategyTest.groovy
@@ -6,7 +6,6 @@
 package edu.ie3.datamodel.io.naming
 
 import edu.ie3.datamodel.io.source.TimeSeriesMappingSource
-import edu.ie3.datamodel.models.profile.BdewStandardLoadProfile
 import edu.ie3.datamodel.models.input.MeasurementUnitInput
 import edu.ie3.datamodel.models.input.NodeInput
 import edu.ie3.datamodel.models.input.RandomLoadParameters
@@ -38,6 +37,7 @@ import edu.ie3.datamodel.models.input.system.type.StorageTypeInput
 import edu.ie3.datamodel.models.input.system.type.WecTypeInput
 import edu.ie3.datamodel.models.input.thermal.CylindricalStorageInput
 import edu.ie3.datamodel.models.input.thermal.ThermalHouseInput
+import edu.ie3.datamodel.models.profile.BdewStandardLoadProfile
 import edu.ie3.datamodel.models.result.NodeResult
 import edu.ie3.datamodel.models.result.connector.LineResult
 import edu.ie3.datamodel.models.result.connector.SwitchResult
diff --git a/src/test/groovy/edu/ie3/datamodel/io/naming/FileNamingStrategyTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/naming/FileNamingStrategyTest.groovy
index e36fe9c9d..0a6565377 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/naming/FileNamingStrategyTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/naming/FileNamingStrategyTest.groovy
@@ -9,7 +9,6 @@ import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
 import edu.ie3.datamodel.io.naming.timeseries.IndividualTimeSeriesMetaInformation
 import edu.ie3.datamodel.io.naming.timeseries.LoadProfileTimeSeriesMetaInformation
 import edu.ie3.datamodel.io.source.TimeSeriesMappingSource
-import edu.ie3.datamodel.models.profile.BdewStandardLoadProfile
 import edu.ie3.datamodel.models.UniqueEntity
 import edu.ie3.datamodel.models.input.MeasurementUnitInput
 import edu.ie3.datamodel.models.input.NodeInput
@@ -41,6 +40,7 @@ import edu.ie3.datamodel.models.input.system.type.StorageTypeInput
 import edu.ie3.datamodel.models.input.system.type.WecTypeInput
 import edu.ie3.datamodel.models.input.thermal.CylindricalStorageInput
 import edu.ie3.datamodel.models.input.thermal.ThermalHouseInput
+import edu.ie3.datamodel.models.profile.BdewStandardLoadProfile
 import edu.ie3.datamodel.models.result.NodeResult
 import edu.ie3.datamodel.models.result.connector.LineResult
 import edu.ie3.datamodel.models.result.connector.SwitchResult
diff --git a/src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy
index 65dc1e1a6..ac2c24ab9 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/processor/input/InputEntityProcessorTest.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.processor.input
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.models.OperationTime
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.NodeInput
@@ -30,8 +32,6 @@ import tech.units.indriya.quantity.Quantities
 
 import java.time.ZonedDateTime
 
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
-
 /**
  * Testing the function of processors
  *
diff --git a/src/test/groovy/edu/ie3/datamodel/io/processor/result/ResultEntityProcessorTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/processor/result/ResultEntityProcessorTest.groovy
index 94f55d0ad..47eddf263 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/processor/result/ResultEntityProcessorTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/processor/result/ResultEntityProcessorTest.groovy
@@ -21,9 +21,9 @@ import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 import tech.units.indriya.unit.Units
 
+import java.time.ZonedDateTime
 import javax.measure.Quantity
 import javax.measure.quantity.*
-import java.time.ZonedDateTime
 
 class ResultEntityProcessorTest extends Specification {
 
@@ -301,4 +301,3 @@ class ResultEntityProcessorTest extends Specification {
     }
   }
 }
-
diff --git a/src/test/groovy/edu/ie3/datamodel/io/sink/CsvFileSinkTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/sink/CsvFileSinkTest.groovy
index 62491ebc6..db803696e 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/sink/CsvFileSinkTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/sink/CsvFileSinkTest.groovy
@@ -5,16 +5,10 @@
  */
 package edu.ie3.datamodel.io.sink
 
-import edu.ie3.datamodel.models.result.system.EmResult
-import edu.ie3.datamodel.models.result.system.FlexOptionsResult
-
-import java.nio.file.Path
-
+import static edu.ie3.util.quantities.PowerSystemUnits.DEGREE_GEOM
 import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLTAMPERE
 import static tech.units.indriya.unit.Units.PERCENT
-import static edu.ie3.util.quantities.PowerSystemUnits.DEGREE_GEOM
-import edu.ie3.datamodel.models.input.system.EmInput
-import edu.ie3.datamodel.models.input.system.LoadInput
+
 import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.processor.ProcessorProvider
 import edu.ie3.datamodel.io.processor.input.InputEntityProcessor
@@ -31,14 +25,18 @@ import edu.ie3.datamodel.models.input.connector.type.LineTypeInput
 import edu.ie3.datamodel.models.input.connector.type.Transformer2WTypeInput
 import edu.ie3.datamodel.models.input.graphics.LineGraphicInput
 import edu.ie3.datamodel.models.input.graphics.NodeGraphicInput
+import edu.ie3.datamodel.models.input.system.EmInput
 import edu.ie3.datamodel.models.input.system.EvcsInput
+import edu.ie3.datamodel.models.input.system.LoadInput
 import edu.ie3.datamodel.models.input.system.PvInput
 import edu.ie3.datamodel.models.input.system.characteristic.CosPhiFixed
 import edu.ie3.datamodel.models.input.thermal.CylindricalStorageInput
 import edu.ie3.datamodel.models.input.thermal.ThermalBusInput
 import edu.ie3.datamodel.models.input.thermal.ThermalHouseInput
+import edu.ie3.datamodel.models.result.system.EmResult
 import edu.ie3.datamodel.models.result.system.EvResult
 import edu.ie3.datamodel.models.result.system.EvcsResult
+import edu.ie3.datamodel.models.result.system.FlexOptionsResult
 import edu.ie3.datamodel.models.result.system.PvResult
 import edu.ie3.datamodel.models.result.system.WecResult
 import edu.ie3.datamodel.models.timeseries.TimeSeries
@@ -48,8 +46,8 @@ import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue
 import edu.ie3.datamodel.models.value.EnergyPriceValue
 import edu.ie3.datamodel.models.value.Value
 import edu.ie3.test.common.GridTestData
-import edu.ie3.test.common.SystemParticipantTestData
 import edu.ie3.test.common.SampleJointGrid
+import edu.ie3.test.common.SystemParticipantTestData
 import edu.ie3.test.common.ThermalUnitInputTestData
 import edu.ie3.test.common.TimeSeriesTestData
 import edu.ie3.util.TimeUtil
@@ -58,6 +56,7 @@ import spock.lang.Shared
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
+import java.nio.file.Path
 import javax.measure.Quantity
 import javax.measure.quantity.Power
 
diff --git a/src/test/groovy/edu/ie3/datamodel/io/sink/InfluxDbSinkIT.groovy b/src/test/groovy/edu/ie3/datamodel/io/sink/InfluxDbSinkIT.groovy
index 4b5c57905..eb22b04cd 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/sink/InfluxDbSinkIT.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/sink/InfluxDbSinkIT.groovy
@@ -6,9 +6,9 @@
 package edu.ie3.datamodel.io.sink
 
 
-import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.connectors.InfluxDbConnector
 import edu.ie3.datamodel.io.naming.EntityPersistenceNamingStrategy
+import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.NodeInput
 import edu.ie3.datamodel.models.result.ResultEntity
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/EntitySourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/EntitySourceTest.groovy
index 4b51be15b..f2572db04 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/EntitySourceTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/EntitySourceTest.groovy
@@ -10,9 +10,8 @@ import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.source.csv.CsvDataSource
 import edu.ie3.datamodel.models.input.OperatorInput
 import edu.ie3.datamodel.models.input.thermal.ThermalBusInput
-import edu.ie3.test.common.SystemParticipantTestData as sptd
 import edu.ie3.test.common.GridTestData as gtd
-
+import edu.ie3.test.common.SystemParticipantTestData as sptd
 import spock.lang.Shared
 import spock.lang.Specification
 
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvDataSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvDataSourceTest.groovy
index e6c58dd97..d79c0e9d5 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvDataSourceTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvDataSourceTest.groovy
@@ -9,7 +9,6 @@ import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.models.UniqueEntity
 import edu.ie3.datamodel.models.input.NodeInput
 import edu.ie3.test.common.SystemParticipantTestData as sptd
-
 import spock.lang.Shared
 import spock.lang.Specification
 
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvResultEntitySourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvResultEntitySourceTest.groovy
index 65692269d..3ccbd5105 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvResultEntitySourceTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvResultEntitySourceTest.groovy
@@ -6,9 +6,8 @@
 package edu.ie3.datamodel.io.source.csv
 
 import edu.ie3.datamodel.io.source.ResultEntitySource
-import spock.lang.Specification
-
 import edu.ie3.test.common.ResultEntityTestData as retd
+import spock.lang.Specification
 
 class CsvResultEntitySourceTest extends Specification implements CsvTestDataMeta {
 
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvThermalSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvThermalSourceTest.groovy
index bead486fc..eba4c636a 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvThermalSourceTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvThermalSourceTest.groovy
@@ -5,9 +5,9 @@
  */
 package edu.ie3.datamodel.io.source.csv
 
-import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.factory.input.AssetInputEntityData
 import edu.ie3.datamodel.io.factory.input.ThermalUnitInputEntityData
+import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.source.ThermalSource
 import edu.ie3.datamodel.io.source.TypeSource
 import edu.ie3.datamodel.models.input.OperatorInput
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceIT.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceIT.groovy
index de1857954..2f1935193 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceIT.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceIT.groovy
@@ -5,18 +5,18 @@
  */
 package edu.ie3.datamodel.io.source.csv
 
-import java.nio.file.Path
-
 import static edu.ie3.test.common.TimeSeriesSourceTestData.*
 
 import edu.ie3.datamodel.exceptions.SourceException
-import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.factory.timeseries.TimeBasedSimpleValueFactory
+import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.models.value.HeatAndPValue
 import edu.ie3.util.interval.ClosedInterval
 import spock.lang.Shared
 import spock.lang.Specification
 
+import java.nio.file.Path
+
 class CsvTimeSeriesSourceIT extends Specification implements CsvTestDataMeta {
 
   @Shared
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceTest.groovy
index 5eaaa914e..b5f680079 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceTest.groovy
@@ -5,22 +5,20 @@
  */
 package edu.ie3.datamodel.io.source.csv
 
-import edu.ie3.datamodel.io.csv.CsvIndividualTimeSeriesMetaInformation
-import edu.ie3.datamodel.io.naming.FileNamingStrategy
-import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
-
-import java.nio.file.Path
-
 import static edu.ie3.datamodel.models.StandardUnits.ENERGY_PRICE
 
 import edu.ie3.datamodel.exceptions.SourceException
+import edu.ie3.datamodel.io.csv.CsvIndividualTimeSeriesMetaInformation
 import edu.ie3.datamodel.io.factory.timeseries.TimeBasedSimpleValueFactory
+import edu.ie3.datamodel.io.naming.FileNamingStrategy
+import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
 import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue
 import edu.ie3.datamodel.models.value.*
 import edu.ie3.util.TimeUtil
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
+import java.nio.file.Path
 import java.time.ZoneId
 
 class CsvTimeSeriesSourceTest extends Specification implements CsvTestDataMeta {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTypeSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTypeSourceTest.groovy
index 2aa6331f5..ecc205a40 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTypeSourceTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTypeSourceTest.groovy
@@ -8,9 +8,9 @@ package edu.ie3.datamodel.io.source.csv
 import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.source.TypeSource
 import edu.ie3.datamodel.models.input.OperatorInput
-import spock.lang.Specification
 import edu.ie3.test.common.GridTestData as gtd
 import edu.ie3.test.common.SystemParticipantTestData as sptd
+import spock.lang.Specification
 
 
 class CsvTypeSourceTest extends Specification implements CsvTestDataMeta {
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvWeatherSourceIconTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvWeatherSourceIconTest.groovy
index 092cb3eff..d83c8d991 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvWeatherSourceIconTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvWeatherSourceIconTest.groovy
@@ -5,8 +5,8 @@
  */
 package edu.ie3.datamodel.io.source.csv
 
-import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.factory.timeseries.IconTimeBasedWeatherValueFactory
+import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.source.IdCoordinateSource
 import edu.ie3.datamodel.models.timeseries.individual.IndividualTimeSeries
 import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSourceIT.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSourceIT.groovy
index 4ad4d730f..8a895bc12 100644
--- a/src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSourceIT.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/io/source/sql/SqlTimeSeriesSourceIT.groovy
@@ -5,8 +5,6 @@
  */
 package edu.ie3.datamodel.io.source.sql
 
-import edu.ie3.test.helper.TestContainerHelper
-
 import static edu.ie3.test.common.TimeSeriesSourceTestData.*
 
 import edu.ie3.datamodel.exceptions.SourceException
@@ -15,6 +13,7 @@ import edu.ie3.datamodel.io.naming.DatabaseNamingStrategy
 import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
 import edu.ie3.datamodel.io.naming.timeseries.IndividualTimeSeriesMetaInformation
 import edu.ie3.datamodel.models.value.*
+import edu.ie3.test.helper.TestContainerHelper
 import edu.ie3.util.interval.ClosedInterval
 import org.testcontainers.containers.Container
 import org.testcontainers.containers.PostgreSQLContainer
diff --git a/src/test/groovy/edu/ie3/datamodel/models/CommonVoltageLevelTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/CommonVoltageLevelTest.groovy
index 85c6f5c38..041f12627 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/CommonVoltageLevelTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/CommonVoltageLevelTest.groovy
@@ -5,6 +5,9 @@
  */
 package edu.ie3.datamodel.models
 
+import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLT
+import static tech.units.indriya.unit.Units.VOLT
+
 import edu.ie3.datamodel.exceptions.VoltageLevelException
 import edu.ie3.datamodel.models.voltagelevels.CommonVoltageLevel
 import edu.ie3.util.interval.RightOpenInterval
@@ -12,9 +15,6 @@ import spock.lang.Shared
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLT
-import static tech.units.indriya.unit.Units.VOLT
-
 class CommonVoltageLevelTest extends Specification {
   @Shared
   CommonVoltageLevel dut = new CommonVoltageLevel(
diff --git a/src/test/groovy/edu/ie3/datamodel/models/GermanVoltageLevelUtilsTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/GermanVoltageLevelUtilsTest.groovy
index 496385ffe..f32111e3b 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/GermanVoltageLevelUtilsTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/GermanVoltageLevelUtilsTest.groovy
@@ -5,13 +5,13 @@
  */
 package edu.ie3.datamodel.models
 
+import static edu.ie3.datamodel.models.voltagelevels.GermanVoltageLevelUtils.*
+import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLT
+
 import edu.ie3.datamodel.models.voltagelevels.CommonVoltageLevel
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import static edu.ie3.datamodel.models.voltagelevels.GermanVoltageLevelUtils.*
-import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLT
-
 class GermanVoltageLevelUtilsTest extends Specification {
 
   def "The common german voltage level enum should be able to correctly parse different valid inputs"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/models/input/container/JointGridContainerTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/input/container/JointGridContainerTest.groovy
index 0baa37cc0..5b8147f20 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/input/container/JointGridContainerTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/input/container/JointGridContainerTest.groovy
@@ -5,12 +5,12 @@
  */
 package edu.ie3.datamodel.models.input.container
 
+import static edu.ie3.test.common.SystemParticipantTestData.emptySystemParticipants
+
 import edu.ie3.test.common.GridTestData
 import edu.ie3.test.common.SystemParticipantTestData
 import spock.lang.Specification
 
-import static edu.ie3.test.common.SystemParticipantTestData.emptySystemParticipants
-
 class JointGridContainerTest extends Specification {
   private static final GRID_NAME = "single_grid"
 
diff --git a/src/test/groovy/edu/ie3/datamodel/models/input/system/BmInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/input/system/BmInputTest.groovy
index a5775d34d..877a35be1 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/input/system/BmInputTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/input/system/BmInputTest.groovy
@@ -5,12 +5,12 @@
  */
 package edu.ie3.datamodel.models.input.system
 
+import static edu.ie3.util.quantities.PowerSystemUnits.EURO_PER_MEGAWATTHOUR
+
 import edu.ie3.test.common.SystemParticipantTestData
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import static edu.ie3.util.quantities.PowerSystemUnits.EURO_PER_MEGAWATTHOUR
-
 class BmInputTest extends Specification {
 
   def "A BmInput copy method should work as expected"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/models/input/system/EmInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/input/system/EmInputTest.groovy
index 20e6bbe31..f8ca44650 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/input/system/EmInputTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/input/system/EmInputTest.groovy
@@ -6,6 +6,7 @@
 package edu.ie3.datamodel.models.input.system
 
 import static edu.ie3.datamodel.models.ControlStrategy.DefaultControlStrategies.NO_CONTROL_STRATEGY
+
 import edu.ie3.datamodel.models.ControlStrategy
 import edu.ie3.test.common.SystemParticipantTestData
 import spock.lang.Specification
diff --git a/src/test/groovy/edu/ie3/datamodel/models/input/system/LoadInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/input/system/LoadInputTest.groovy
index b6dfbfcbb..a1d04cc30 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/input/system/LoadInputTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/input/system/LoadInputTest.groovy
@@ -5,16 +5,16 @@
  */
 package edu.ie3.datamodel.models.input.system
 
-import edu.ie3.datamodel.models.profile.BdewStandardLoadProfile
+import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLTAMPERE
+import static edu.ie3.util.quantities.PowerSystemUnits.KILOWATTHOUR
+
 import edu.ie3.datamodel.models.input.system.characteristic.CosPhiFixed
+import edu.ie3.datamodel.models.profile.BdewStandardLoadProfile
 import edu.ie3.test.common.GridTestData
 import edu.ie3.test.common.SystemParticipantTestData
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLTAMPERE
-import static edu.ie3.util.quantities.PowerSystemUnits.KILOWATTHOUR
-
 
 class LoadInputTest extends Specification {
 
diff --git a/src/test/groovy/edu/ie3/datamodel/models/input/system/PvInputTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/input/system/PvInputTest.groovy
index 4d00c8d37..ea9a0262d 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/input/system/PvInputTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/input/system/PvInputTest.groovy
@@ -5,14 +5,14 @@
  */
 package edu.ie3.datamodel.models.input.system
 
-import edu.ie3.test.common.SystemParticipantTestData
-import spock.lang.Specification
-import tech.units.indriya.quantity.Quantities
-
 import static edu.ie3.util.quantities.PowerSystemUnits.DEGREE_GEOM
 import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLTAMPERE
 import static tech.units.indriya.unit.Units.PERCENT
 
+import edu.ie3.test.common.SystemParticipantTestData
+import spock.lang.Specification
+import tech.units.indriya.quantity.Quantities
+
 
 class PvInputTest extends Specification {
 
diff --git a/src/test/groovy/edu/ie3/datamodel/models/input/system/type/chargingpoint/ChargingPointTypeUtilsTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/input/system/type/chargingpoint/ChargingPointTypeUtilsTest.groovy
index 16339003e..285a969aa 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/input/system/type/chargingpoint/ChargingPointTypeUtilsTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/input/system/type/chargingpoint/ChargingPointTypeUtilsTest.groovy
@@ -5,14 +5,14 @@
  */
 package edu.ie3.datamodel.models.input.system.type.chargingpoint
 
+import static edu.ie3.datamodel.models.input.system.type.chargingpoint.ChargingPointTypeUtils.*
+import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLTAMPERE
+
 import edu.ie3.datamodel.exceptions.ChargingPointTypeException
 import edu.ie3.datamodel.models.ElectricCurrentType
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import static edu.ie3.datamodel.models.input.system.type.chargingpoint.ChargingPointTypeUtils.*
-import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLTAMPERE
-
 /**
  * //ToDo: Class Description
  *
diff --git a/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/CharacteristicPointTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/CharacteristicPointTest.groovy
index d69f8d95d..40499c5e7 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/CharacteristicPointTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/CharacteristicPointTest.groovy
@@ -5,6 +5,10 @@
  */
 package edu.ie3.datamodel.models.system.characteristic
 
+import static edu.ie3.util.quantities.PowerSystemUnits.KILOWATT
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+import static tech.units.indriya.unit.Units.PERCENT
+
 import edu.ie3.datamodel.exceptions.ParsingException
 import edu.ie3.datamodel.models.input.system.characteristic.CharacteristicPoint
 import spock.lang.Specification
@@ -13,10 +17,6 @@ import tech.units.indriya.quantity.Quantities
 import javax.measure.quantity.Dimensionless
 import javax.measure.quantity.Power
 
-import static edu.ie3.util.quantities.PowerSystemUnits.KILOWATT
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
-import static tech.units.indriya.unit.Units.PERCENT
-
 class CharacteristicPointTest extends Specification {
   def "A set of CharacteristicCoordinates are sorted correctly"() {
     given: "A set of points"
diff --git a/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/OlmCharacteristicTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/OlmCharacteristicTest.groovy
index bd98d97e2..dd355b830 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/OlmCharacteristicTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/OlmCharacteristicTest.groovy
@@ -5,6 +5,9 @@
  */
 package edu.ie3.datamodel.models.system.characteristic
 
+import static edu.ie3.util.quantities.PowerSystemUnits.METRE_PER_SECOND
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.ParsingException
 import edu.ie3.datamodel.models.input.system.characteristic.CharacteristicPoint
 import edu.ie3.datamodel.models.input.system.characteristic.OlmCharacteristicInput
@@ -15,9 +18,6 @@ import tech.units.indriya.quantity.Quantities
 import javax.measure.quantity.Dimensionless
 import javax.measure.quantity.Speed
 
-import static edu.ie3.util.quantities.PowerSystemUnits.METRE_PER_SECOND
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
-
 class OlmCharacteristicTest extends Specification {
   @Shared
   OlmCharacteristicInput validInput
diff --git a/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/ReactivePowerCharacteristicTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/ReactivePowerCharacteristicTest.groovy
index 8ef88bb93..f39a5aa61 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/ReactivePowerCharacteristicTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/ReactivePowerCharacteristicTest.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.models.system.characteristic
 
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.ParsingException
 import edu.ie3.datamodel.models.input.system.characteristic.*
 import spock.lang.Shared
@@ -13,8 +15,6 @@ import tech.units.indriya.quantity.Quantities
 
 import javax.measure.quantity.Dimensionless
 
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
-
 class ReactivePowerCharacteristicTest extends Specification {
   @Shared
   CosPhiFixed validCosPhiFixed
diff --git a/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/WecCharacteristicTest.groovy b/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/WecCharacteristicTest.groovy
index 62546f077..149bddc94 100644
--- a/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/WecCharacteristicTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/models/system/characteristic/WecCharacteristicTest.groovy
@@ -5,6 +5,9 @@
  */
 package edu.ie3.datamodel.models.system.characteristic
 
+import static edu.ie3.util.quantities.PowerSystemUnits.METRE_PER_SECOND
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.ParsingException
 import edu.ie3.datamodel.models.input.system.characteristic.CharacteristicPoint
 import edu.ie3.datamodel.models.input.system.characteristic.WecCharacteristicInput
@@ -15,9 +18,6 @@ import tech.units.indriya.quantity.Quantities
 import javax.measure.quantity.Dimensionless
 import javax.measure.quantity.Speed
 
-import static edu.ie3.util.quantities.PowerSystemUnits.METRE_PER_SECOND
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
-
 class WecCharacteristicTest extends Specification {
   @Shared
   WecCharacteristicInput validInput
diff --git a/src/test/groovy/edu/ie3/datamodel/utils/ContainerUtilsTest.groovy b/src/test/groovy/edu/ie3/datamodel/utils/ContainerUtilsTest.groovy
index 9d1c8f96c..c07ff0d54 100644
--- a/src/test/groovy/edu/ie3/datamodel/utils/ContainerUtilsTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/utils/ContainerUtilsTest.groovy
@@ -5,6 +5,9 @@
  */
 package edu.ie3.datamodel.utils
 
+import static edu.ie3.datamodel.models.voltagelevels.GermanVoltageLevelUtils.*
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.InvalidGridException
 import edu.ie3.datamodel.graph.DistanceWeightedGraph
 import edu.ie3.datamodel.graph.ImpedanceWeightedGraph
@@ -24,9 +27,6 @@ import spock.lang.Shared
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
-import static edu.ie3.datamodel.models.voltagelevels.GermanVoltageLevelUtils.*
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
-
 class ContainerUtilsTest extends Specification {
 
   @Shared
diff --git a/src/test/groovy/edu/ie3/datamodel/utils/GridAndGeoUtilsTest.groovy b/src/test/groovy/edu/ie3/datamodel/utils/GridAndGeoUtilsTest.groovy
index 4e06605a8..8b9f0cf41 100644
--- a/src/test/groovy/edu/ie3/datamodel/utils/GridAndGeoUtilsTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/utils/GridAndGeoUtilsTest.groovy
@@ -5,13 +5,12 @@
  */
 package edu.ie3.datamodel.utils
 
-import edu.ie3.util.geo.GeoUtils
-import edu.ie3.util.quantities.QuantityUtil
-import spock.lang.Shared
-
 import static edu.ie3.util.quantities.PowerSystemUnits.*
 
 import edu.ie3.test.common.GridTestData
+import edu.ie3.util.geo.GeoUtils
+import edu.ie3.util.quantities.QuantityUtil
+import spock.lang.Shared
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
diff --git a/src/test/groovy/edu/ie3/datamodel/utils/validation/SystemParticipantValidationUtilsTest.groovy b/src/test/groovy/edu/ie3/datamodel/utils/validation/SystemParticipantValidationUtilsTest.groovy
index 6f9cc47aa..c82979e66 100644
--- a/src/test/groovy/edu/ie3/datamodel/utils/validation/SystemParticipantValidationUtilsTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/utils/validation/SystemParticipantValidationUtilsTest.groovy
@@ -5,6 +5,9 @@
  */
 package edu.ie3.datamodel.utils.validation
 
+import static edu.ie3.datamodel.models.StandardUnits.*
+import static tech.units.indriya.unit.Units.PERCENT
+
 import edu.ie3.datamodel.exceptions.InvalidEntityException
 import edu.ie3.datamodel.exceptions.NotImplementedException
 import edu.ie3.datamodel.models.input.NodeInput
@@ -21,9 +24,6 @@ import tech.units.indriya.quantity.Quantities
 
 import javax.measure.quantity.*
 
-import static edu.ie3.datamodel.models.StandardUnits.*
-import static tech.units.indriya.unit.Units.PERCENT
-
 class SystemParticipantValidationUtilsTest extends Specification {
 
   def "Instantiating a ConnectorValidationUtil leads to an exception"() {
diff --git a/src/test/groovy/edu/ie3/datamodel/utils/validation/ValidationUtilsTest.groovy b/src/test/groovy/edu/ie3/datamodel/utils/validation/ValidationUtilsTest.groovy
index d6971bcb0..ab7eb8d2e 100644
--- a/src/test/groovy/edu/ie3/datamodel/utils/validation/ValidationUtilsTest.groovy
+++ b/src/test/groovy/edu/ie3/datamodel/utils/validation/ValidationUtilsTest.groovy
@@ -5,6 +5,12 @@
  */
 package edu.ie3.datamodel.utils.validation
 
+import static edu.ie3.datamodel.models.StandardUnits.*
+import static edu.ie3.datamodel.utils.validation.DummyAssetInput.invalid
+import static edu.ie3.datamodel.utils.validation.DummyAssetInput.valid
+import static edu.ie3.util.quantities.PowerSystemUnits.OHM_PER_KILOMETRE
+import static edu.ie3.util.quantities.PowerSystemUnits.PU
+
 import edu.ie3.datamodel.exceptions.DuplicateEntitiesException
 import edu.ie3.datamodel.exceptions.FailedValidationException
 import edu.ie3.datamodel.exceptions.InvalidEntityException
@@ -26,12 +32,6 @@ import tech.units.indriya.quantity.Quantities
 
 import javax.measure.Quantity
 
-import static edu.ie3.datamodel.models.StandardUnits.*
-import static edu.ie3.datamodel.utils.validation.DummyAssetInput.invalid
-import static edu.ie3.datamodel.utils.validation.DummyAssetInput.valid
-import static edu.ie3.util.quantities.PowerSystemUnits.OHM_PER_KILOMETRE
-import static edu.ie3.util.quantities.PowerSystemUnits.PU
-
 class ValidationUtilsTest extends Specification {
 
   def "Smoke Test: Correct asset throws no exception"() {
diff --git a/src/test/groovy/edu/ie3/test/common/ComplexTopology.groovy b/src/test/groovy/edu/ie3/test/common/ComplexTopology.groovy
index e97f57972..5637f74d2 100644
--- a/src/test/groovy/edu/ie3/test/common/ComplexTopology.groovy
+++ b/src/test/groovy/edu/ie3/test/common/ComplexTopology.groovy
@@ -6,6 +6,7 @@
 package edu.ie3.test.common
 
 import static edu.ie3.test.common.SystemParticipantTestData.emptySystemParticipants
+
 import edu.ie3.datamodel.graph.SubGridGate
 import edu.ie3.datamodel.graph.SubGridTopologyGraph
 import edu.ie3.datamodel.models.input.connector.ConnectorPort
diff --git a/src/test/groovy/edu/ie3/test/common/GridTestData.groovy b/src/test/groovy/edu/ie3/test/common/GridTestData.groovy
index 6c41c051a..ebe746e9c 100644
--- a/src/test/groovy/edu/ie3/test/common/GridTestData.groovy
+++ b/src/test/groovy/edu/ie3/test/common/GridTestData.groovy
@@ -5,6 +5,9 @@
  */
 package edu.ie3.test.common
 
+import static edu.ie3.datamodel.models.StandardUnits.*
+import static edu.ie3.util.quantities.PowerSystemUnits.*
+
 import edu.ie3.datamodel.models.OperationTime
 import edu.ie3.datamodel.models.input.MeasurementUnitInput
 import edu.ie3.datamodel.models.input.NodeInput
@@ -26,9 +29,6 @@ import org.locationtech.jts.geom.Point
 import org.locationtech.jts.io.geojson.GeoJsonReader
 import tech.units.indriya.quantity.Quantities
 
-import static edu.ie3.datamodel.models.StandardUnits.*
-import static edu.ie3.util.quantities.PowerSystemUnits.*
-
 /**
  * This class contains a collection of different model instances that can be used for testing purposes.
  * Please note that these entities do NOT necessarily form a valid grid. For valid topologies please refer
diff --git a/src/test/groovy/edu/ie3/test/common/ResultEntityTestData.groovy b/src/test/groovy/edu/ie3/test/common/ResultEntityTestData.groovy
index f9fd980bc..cc1f86bfb 100644
--- a/src/test/groovy/edu/ie3/test/common/ResultEntityTestData.groovy
+++ b/src/test/groovy/edu/ie3/test/common/ResultEntityTestData.groovy
@@ -10,8 +10,8 @@ import edu.ie3.util.quantities.PowerSystemUnits
 import tech.units.indriya.ComparableQuantity
 import tech.units.indriya.quantity.Quantities
 
-import javax.measure.quantity.Power
 import java.time.ZonedDateTime
+import javax.measure.quantity.Power
 
 class ResultEntityTestData {
 
diff --git a/src/test/groovy/edu/ie3/test/common/SampleJointGrid.groovy b/src/test/groovy/edu/ie3/test/common/SampleJointGrid.groovy
index a9f1aeb63..8adea5e57 100644
--- a/src/test/groovy/edu/ie3/test/common/SampleJointGrid.groovy
+++ b/src/test/groovy/edu/ie3/test/common/SampleJointGrid.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.test.common
 
+import static edu.ie3.util.quantities.PowerSystemUnits.*
+
 import edu.ie3.datamodel.exceptions.ParsingException
 import edu.ie3.datamodel.models.OperationTime
 import edu.ie3.datamodel.models.input.NodeInput
@@ -30,8 +32,6 @@ import tech.units.indriya.quantity.Quantities
 
 import java.util.stream.Collectors
 
-import static edu.ie3.util.quantities.PowerSystemUnits.*
-
 /**
  * //ToDo: Class Description
  *
diff --git a/src/test/groovy/edu/ie3/test/common/SystemParticipantTestData.groovy b/src/test/groovy/edu/ie3/test/common/SystemParticipantTestData.groovy
index bfafb5d6b..067ed6a50 100644
--- a/src/test/groovy/edu/ie3/test/common/SystemParticipantTestData.groovy
+++ b/src/test/groovy/edu/ie3/test/common/SystemParticipantTestData.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.test.common
 
+import static edu.ie3.datamodel.models.StandardUnits.*
+
 import edu.ie3.datamodel.models.OperationTime
 import edu.ie3.datamodel.models.input.NodeInput
 import edu.ie3.datamodel.models.input.OperatorInput
@@ -29,8 +31,6 @@ import tech.units.indriya.quantity.Quantities
 
 import javax.measure.quantity.*
 
-import static edu.ie3.datamodel.models.StandardUnits.*
-
 class SystemParticipantTestData {
 
   // general participant data
diff --git a/src/test/groovy/edu/ie3/test/common/TimeSeriesTestData.groovy b/src/test/groovy/edu/ie3/test/common/TimeSeriesTestData.groovy
index 61986f7ad..1c61ef3f3 100644
--- a/src/test/groovy/edu/ie3/test/common/TimeSeriesTestData.groovy
+++ b/src/test/groovy/edu/ie3/test/common/TimeSeriesTestData.groovy
@@ -5,8 +5,12 @@
  */
 package edu.ie3.test.common
 
-import edu.ie3.datamodel.models.profile.BdewStandardLoadProfile
+import static edu.ie3.util.quantities.PowerSystemUnits.*
+import static tech.units.indriya.unit.Units.CELSIUS
+import static tech.units.indriya.unit.Units.METRE_PER_SECOND
+
 import edu.ie3.datamodel.models.StandardUnits
+import edu.ie3.datamodel.models.profile.BdewStandardLoadProfile
 import edu.ie3.datamodel.models.timeseries.IntValue
 import edu.ie3.datamodel.models.timeseries.TimeSeries
 import edu.ie3.datamodel.models.timeseries.individual.IndividualTimeSeries
@@ -24,10 +28,6 @@ import java.time.DayOfWeek
 import java.time.ZoneId
 import java.time.ZonedDateTime
 
-import static edu.ie3.util.quantities.PowerSystemUnits.*
-import static tech.units.indriya.unit.Units.CELSIUS
-import static tech.units.indriya.unit.Units.METRE_PER_SECOND
-
 trait TimeSeriesTestData {
   GeometryFactory geometryFactory = new GeometryFactory(new PrecisionModel(), 4326)
   Point defaultLocation = geometryFactory.createPoint(new Coordinate(7.412152, 51.492758))
diff --git a/src/test/groovy/edu/ie3/test/common/TypeTestData.groovy b/src/test/groovy/edu/ie3/test/common/TypeTestData.groovy
index 8dd69378d..8555fc0cc 100644
--- a/src/test/groovy/edu/ie3/test/common/TypeTestData.groovy
+++ b/src/test/groovy/edu/ie3/test/common/TypeTestData.groovy
@@ -5,13 +5,13 @@
  */
 package edu.ie3.test.common
 
+import static edu.ie3.util.quantities.PowerSystemUnits.*
+import static tech.units.indriya.unit.Units.*
+
 import edu.ie3.datamodel.models.input.system.characteristic.WecCharacteristicInput
 import edu.ie3.datamodel.models.input.system.type.*
 import tech.units.indriya.quantity.Quantities
 
-import static edu.ie3.util.quantities.PowerSystemUnits.*
-import static tech.units.indriya.unit.Units.*
-
 class TypeTestData extends GridTestData {
   public static final BmTypeInput bmType = new BmTypeInput(
   UUID.fromString("c3bd30f5-1a62-4a37-86e3-074040d965a4"),
diff --git a/src/test/groovy/edu/ie3/test/common/WeatherTestData.groovy b/src/test/groovy/edu/ie3/test/common/WeatherTestData.groovy
index 950705e57..486aaf894 100644
--- a/src/test/groovy/edu/ie3/test/common/WeatherTestData.groovy
+++ b/src/test/groovy/edu/ie3/test/common/WeatherTestData.groovy
@@ -12,9 +12,9 @@ import edu.ie3.util.geo.GeoUtils
 import org.locationtech.jts.geom.Point
 import tech.units.indriya.ComparableQuantity
 
-import javax.measure.quantity.Length
 import java.util.stream.Collectors
 import java.util.stream.Stream
+import javax.measure.quantity.Length
 
 abstract class WeatherTestData {