diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/common/FederatedCatalogCommon.java b/system-tests/src/test/java/org/eclipse/edc/samples/common/FederatedCatalogCommon.java
index d8c1125e..3a0fed1a 100644
--- a/system-tests/src/test/java/org/eclipse/edc/samples/common/FederatedCatalogCommon.java
+++ b/system-tests/src/test/java/org/eclipse/edc/samples/common/FederatedCatalogCommon.java
@@ -28,7 +28,8 @@
 import static org.eclipse.edc.samples.common.PrerequisitesCommon.API_KEY_HEADER_KEY;
 import static org.eclipse.edc.samples.common.PrerequisitesCommon.API_KEY_HEADER_VALUE;
 import static org.eclipse.edc.samples.util.TransferUtil.post;
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.Matchers.emptyString;
 
 public class FederatedCatalogCommon {
@@ -64,11 +65,11 @@ public class FederatedCatalogCommon {
     public static final String DATASET_ASSET_ID = "[0].'dcat:dataset'.@id";
 
     public static RuntimeExtension getFcEmbeddedConnector() {
-        return getRuntime(FC_CONNECTOR_MODULE_PATH, CONSUMER,FC_CONNECTOR_CONFIG_PROPERTIES_FILE_PATH);
+        return getRuntime(FC_CONNECTOR_MODULE_PATH, CONSUMER, FC_CONNECTOR_CONFIG_PROPERTIES_FILE_PATH);
     }
 
     public static RuntimeExtension getStandaloneFc() {
-        return getRuntime(STANDALONE_FC_MODULE_PATH, STANDALONE_FC,STANDALONE_FC_CONFIG_PROPERTIES_FILE_PATH);
+        return getRuntime(STANDALONE_FC_MODULE_PATH, STANDALONE_FC, STANDALONE_FC_CONFIG_PROPERTIES_FILE_PATH);
     }
 
     private static RuntimeExtension getRuntime(
diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/federatedCatalog/FederatedCatalog01embeddedTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/federated/catalog/FederatedCatalog01embeddedTest.java
similarity index 68%
rename from system-tests/src/test/java/org/eclipse/edc/samples/federatedCatalog/FederatedCatalog01embeddedTest.java
rename to system-tests/src/test/java/org/eclipse/edc/samples/federated/catalog/FederatedCatalog01embeddedTest.java
index 71768546..a5a247d8 100644
--- a/system-tests/src/test/java/org/eclipse/edc/samples/federatedCatalog/FederatedCatalog01embeddedTest.java
+++ b/system-tests/src/test/java/org/eclipse/edc/samples/federated/catalog/FederatedCatalog01embeddedTest.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.samples.federatedCatalog;
+package org.eclipse.edc.samples.federated.catalog;
 
 import org.assertj.core.api.Assertions;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
@@ -24,20 +24,28 @@
 import java.time.Duration;
 
 import static org.awaitility.Awaitility.await;
-import static org.eclipse.edc.samples.common.FederatedCatalogCommon.*;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.CRAWLER_EXECUTION_DELAY_VALUE;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.CRAWLER_EXECUTION_PERIOD_VALUE;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.DATASET_ASSET_ID;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.EMBEDDED_FC_CATALOG_API_ENDPOINT;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.EMPTY_QUERY_FILE_PATH;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.TIMEOUT;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.createAsset;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.getFcEmbeddedConnector;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.postAndAssertType;
 import static org.eclipse.edc.samples.common.FileTransferCommon.getFileContentFromRelativePath;
 import static org.eclipse.edc.samples.common.NegotiationCommon.createContractDefinition;
 import static org.eclipse.edc.samples.common.NegotiationCommon.createPolicy;
-import static org.eclipse.edc.samples.common.PrerequisitesCommon.*;
+import static org.eclipse.edc.samples.common.PrerequisitesCommon.getProvider;
 
 @EndToEndTest
 public class FederatedCatalog01embeddedTest {
 
     @RegisterExtension
-    static RuntimeExtension participantConnector = getProvider();
+    static final RuntimeExtension participantConnector = getProvider();
 
     @RegisterExtension
-    static RuntimeExtension fcConnector = getFcEmbeddedConnector();
+    static final RuntimeExtension fcConnector = getFcEmbeddedConnector();
 
     @Test
     void shouldStartConnector() {
diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/federatedCatalog/FederatedCatalog02standaloneTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/federated/catalog/FederatedCatalog02standaloneTest.java
similarity index 68%
rename from system-tests/src/test/java/org/eclipse/edc/samples/federatedCatalog/FederatedCatalog02standaloneTest.java
rename to system-tests/src/test/java/org/eclipse/edc/samples/federated/catalog/FederatedCatalog02standaloneTest.java
index 0b768f90..609b8c81 100644
--- a/system-tests/src/test/java/org/eclipse/edc/samples/federatedCatalog/FederatedCatalog02standaloneTest.java
+++ b/system-tests/src/test/java/org/eclipse/edc/samples/federated/catalog/FederatedCatalog02standaloneTest.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.samples.federatedCatalog;
+package org.eclipse.edc.samples.federated.catalog;
 
 import org.assertj.core.api.Assertions;
 import org.eclipse.edc.junit.annotations.EndToEndTest;
@@ -24,19 +24,27 @@
 import java.time.Duration;
 
 import static org.awaitility.Awaitility.await;
-import static org.eclipse.edc.samples.common.FederatedCatalogCommon.*;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.CRAWLER_EXECUTION_DELAY_VALUE;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.CRAWLER_EXECUTION_PERIOD_VALUE;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.DATASET_ASSET_ID;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.EMPTY_QUERY_FILE_PATH;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.STANDALONE_FC_CATALOG_API_ENDPOINT;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.TIMEOUT;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.createAsset;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.getStandaloneFc;
+import static org.eclipse.edc.samples.common.FederatedCatalogCommon.postAndAssertType;
 import static org.eclipse.edc.samples.common.FileTransferCommon.getFileContentFromRelativePath;
 import static org.eclipse.edc.samples.common.NegotiationCommon.createContractDefinition;
 import static org.eclipse.edc.samples.common.NegotiationCommon.createPolicy;
-import static org.eclipse.edc.samples.common.PrerequisitesCommon.*;
+import static org.eclipse.edc.samples.common.PrerequisitesCommon.getProvider;
 
 @EndToEndTest
 public class FederatedCatalog02standaloneTest {
     @RegisterExtension
-    static RuntimeExtension participantConnector = getProvider();
+    static final RuntimeExtension participantConnector = getProvider();
 
     @RegisterExtension
-    static RuntimeExtension standaloneFcRuntime = getStandaloneFc();
+    static final RuntimeExtension standaloneFcRuntime = getStandaloneFc();
 
     @Test
     void shouldStartRuntimes() {