diff --git a/src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java b/src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java
index e53a7c75..9152d68f 100644
--- a/src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/arch/ArchitectureTest.java
@@ -68,6 +68,7 @@ public class ArchitectureTest {
                     "..hs.hosting.asset",
                     "..hs.hosting.asset.validators",
                     "..hs.hosting.asset.factories",
+                    "..hs.scenarios",
                     "..errors",
                     "..mapper",
                     "..ping",
@@ -160,9 +161,11 @@ public class ArchitectureTest {
             .that().resideInAPackage("..hs.office.(*)..")
             .should().onlyBeAccessed().byClassesThat()
             .resideInAnyPackage(
+                    "..hs.office.(*)..",
                     "..hs.office.(*)..",
                     "..hs.booking.(*)..",
                     "..hs.hosting.(*)..",
+                    "..hs.scenarios",
                     "..hs.migration",
                     "..rbacgrant" // TODO.test: just because of RbacGrantsDiagramServiceIntegrationTest
             );
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java
index 4d785a63..70d74414 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/HsOfficeScenarioTests.java
@@ -30,9 +30,9 @@ import net.hostsharing.hsadminng.hs.office.scenarios.person.ShouldUpdatePersonDa
 import net.hostsharing.hsadminng.hs.office.scenarios.subscription.RemoveOperationsContactFromPartner;
 import net.hostsharing.hsadminng.hs.office.scenarios.subscription.SubscribeToMailinglist;
 import net.hostsharing.hsadminng.hs.office.scenarios.subscription.UnsubscribeFromMailinglist;
-import net.hostsharing.hsadminng.test.scenarios.Produces;
-import net.hostsharing.hsadminng.test.scenarios.Requires;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.Produces;
+import net.hostsharing.hsadminng.hs.scenarios.Requires;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
 import net.hostsharing.hsadminng.test.IgnoreOnFailureExtension;
 import org.junit.jupiter.api.ClassOrderer;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AddPhoneNumberToContactData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AddPhoneNumberToContactData.java
index 55530031..501a2a6d 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AddPhoneNumberToContactData.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AddPhoneNumberToContactData.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.contact;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 import org.springframework.http.HttpStatus;
 
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AmendContactData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AmendContactData.java
index 96b075e8..5f05b6a8 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AmendContactData.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/AmendContactData.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.contact;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/RemovePhoneNumberFromContactData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/RemovePhoneNumberFromContactData.java
index 10e54445..03a8e07a 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/RemovePhoneNumberFromContactData.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/RemovePhoneNumberFromContactData.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.contact;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/ReplaceContactData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/ReplaceContactData.java
index 7309d095..d7a0569a 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/ReplaceContactData.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/contact/ReplaceContactData.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.contact;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 
 import static io.restassured.http.ContentType.JSON;
 import static org.springframework.http.HttpStatus.CREATED;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateExternalDebitorForPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateExternalDebitorForPartner.java
index 2e160573..f05a9e47 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateExternalDebitorForPartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateExternalDebitorForPartner.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.debitor;
 
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 import net.hostsharing.hsadminng.hs.office.scenarios.person.CreatePerson;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java
index 763eefb3..daa00811 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSelfDebitorForPartner.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.debitor;
 
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 
 import static io.restassured.http.ContentType.JSON;
 import static org.springframework.http.HttpStatus.CREATED;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java
index 0651665b..b50cc7c9 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/CreateSepaMandateForDebitor.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.debitor;
 
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 
 import static io.restassured.http.ContentType.JSON;
 import static org.springframework.http.HttpStatus.CREATED;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DeleteDebitor.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DeleteDebitor.java
index 8b87086a..2ff0484d 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DeleteDebitor.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DeleteDebitor.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.debitor;
 
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 import org.springframework.http.HttpStatus;
 
 public class DeleteDebitor extends UseCase<DeleteDebitor> {
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DontDeleteDefaultDebitor.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DontDeleteDefaultDebitor.java
index 4a72837e..00d7fa79 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DontDeleteDefaultDebitor.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/DontDeleteDefaultDebitor.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.debitor;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 import org.springframework.http.HttpStatus;
 
 public class DontDeleteDefaultDebitor extends UseCase<DontDeleteDefaultDebitor> {
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/FinallyDeleteSepaMandateForDebitor.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/FinallyDeleteSepaMandateForDebitor.java
index 82d90ed3..7dff8d6a 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/FinallyDeleteSepaMandateForDebitor.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/FinallyDeleteSepaMandateForDebitor.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.debitor;
 
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/InvalidateSepaMandateForDebitor.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/InvalidateSepaMandateForDebitor.java
index 55241a09..501e9f06 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/InvalidateSepaMandateForDebitor.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/debitor/InvalidateSepaMandateForDebitor.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.debitor;
 
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 
 import static io.restassured.http.ContentType.JSON;
 import static org.springframework.http.HttpStatus.OK;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CancelMembership.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CancelMembership.java
index a93106eb..d5d00900 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CancelMembership.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CancelMembership.java
@@ -1,8 +1,8 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership;
 
 import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java
index 40ab5dc7..63541e09 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/CreateMembership.java
@@ -1,8 +1,8 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership;
 
 import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDepositTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDepositTransaction.java
index aab9b9c8..7c7a05ad 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDepositTransaction.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDepositTransaction.java
@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 
 public class CreateCoopAssetsDepositTransaction extends CreateCoopAssetsTransaction {
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDisbursalTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDisbursalTransaction.java
index 627b582b..e605782f 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDisbursalTransaction.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsDisbursalTransaction.java
@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 
 public class CreateCoopAssetsDisbursalTransaction extends CreateCoopAssetsTransaction {
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertSimpleTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertSimpleTransaction.java
index c5f2177f..45cba19d 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertSimpleTransaction.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertSimpleTransaction.java
@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 
 public class CreateCoopAssetsRevertSimpleTransaction extends CreateCoopAssetsTransaction {
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertTransferTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertTransferTransaction.java
index 86c3b701..a1680682 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertTransferTransaction.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsRevertTransferTransaction.java
@@ -1,13 +1,13 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets;
 
 import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 import org.springframework.http.HttpStatus;
 
 import java.math.BigDecimal;
 
-import static net.hostsharing.hsadminng.test.scenarios.ScenarioTest.resolveTyped;
+import static net.hostsharing.hsadminng.hs.scenarios.ScenarioTest.resolveTyped;
 
 public class CreateCoopAssetsRevertTransferTransaction extends CreateCoopAssetsTransaction {
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransaction.java
index 8eecdabf..beb78b52 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransaction.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransaction.java
@@ -1,8 +1,8 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets;
 
 import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransferTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransferTransaction.java
index 8a9a31da..bf43bd85 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransferTransaction.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopassets/CreateCoopAssetsTransferTransaction.java
@@ -1,10 +1,10 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopassets;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 import net.hostsharing.hsadminng.hs.office.scenarios.membership.CreateMembership;
 import net.hostsharing.hsadminng.hs.office.scenarios.partner.CreatePartner;
 
-import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
+import static net.hostsharing.hsadminng.hs.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
 
 public class CreateCoopAssetsTransferTransaction extends CreateCoopAssetsTransaction {
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesCancellationTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesCancellationTransaction.java
index fb88c3ac..19f02820 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesCancellationTransaction.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesCancellationTransaction.java
@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 
 public class CreateCoopSharesCancellationTransaction extends CreateCoopSharesTransaction {
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesRevertTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesRevertTransaction.java
index 18c0654e..4f2a8555 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesRevertTransaction.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesRevertTransaction.java
@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 
 public class CreateCoopSharesRevertTransaction extends CreateCoopSharesTransaction {
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesSubscriptionTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesSubscriptionTransaction.java
index 395d5d26..79f79285 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesSubscriptionTransaction.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesSubscriptionTransaction.java
@@ -1,6 +1,6 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 
 public class CreateCoopSharesSubscriptionTransaction extends CreateCoopSharesTransaction {
 
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesTransaction.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesTransaction.java
index 5e82b3aa..a70cbdf5 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesTransaction.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/membership/coopshares/CreateCoopSharesTransaction.java
@@ -1,8 +1,8 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.membership.coopshares;
 
 import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java
index fe703e34..4ea68cba 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddOperationsContactToPartner.java
@@ -1,8 +1,8 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.partner;
 
 import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java
index d5ffa22f..41732d3a 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/AddRepresentativeToPartner.java
@@ -1,8 +1,8 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.partner;
 
 import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java
index e587ac3c..87ca7c87 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/CreatePartner.java
@@ -1,8 +1,8 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.partner;
 
 import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/DeletePartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/DeletePartner.java
index 8d02d2a0..df0a0c57 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/DeletePartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/partner/DeletePartner.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.partner;
 
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 import org.springframework.http.HttpStatus;
 
 public class DeletePartner extends UseCase<DeletePartner> {
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/CreatePerson.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/CreatePerson.java
index 5a4bf987..39e39068 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/CreatePerson.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/CreatePerson.java
@@ -1,8 +1,8 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.person;
 
 import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 import org.springframework.http.HttpStatus;
 
 public class CreatePerson extends UseCase<CreatePerson> {
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/ShouldUpdatePersonData.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/ShouldUpdatePersonData.java
index f1472005..1d092936 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/ShouldUpdatePersonData.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/person/ShouldUpdatePersonData.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.person;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/RemoveOperationsContactFromPartner.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/RemoveOperationsContactFromPartner.java
index 42b9f45f..905c3a72 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/RemoveOperationsContactFromPartner.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/RemoveOperationsContactFromPartner.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.subscription;
 
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
 
 import static io.restassured.http.ContentType.JSON;
 import static org.springframework.http.HttpStatus.NOT_FOUND;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/SubscribeToMailinglist.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/SubscribeToMailinglist.java
index 7b5acaf4..c524fb18 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/SubscribeToMailinglist.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/SubscribeToMailinglist.java
@@ -1,8 +1,8 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.subscription;
 
 import io.restassured.http.ContentType;
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 import org.springframework.http.HttpStatus;
 
 import static io.restassured.http.ContentType.JSON;
diff --git a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/UnsubscribeFromMailinglist.java b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/UnsubscribeFromMailinglist.java
index 99c63ca9..4a6b34cb 100644
--- a/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/UnsubscribeFromMailinglist.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/subscription/UnsubscribeFromMailinglist.java
@@ -1,7 +1,7 @@
 package net.hostsharing.hsadminng.hs.office.scenarios.subscription;
 
-import net.hostsharing.hsadminng.test.scenarios.UseCase;
-import net.hostsharing.hsadminng.test.scenarios.ScenarioTest;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase;
+import net.hostsharing.hsadminng.hs.scenarios.ScenarioTest;
 
 import static io.restassured.http.ContentType.JSON;
 import static org.springframework.http.HttpStatus.NO_CONTENT;
diff --git a/src/test/java/net/hostsharing/hsadminng/test/scenarios/JsonOptional.java b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/JsonOptional.java
similarity index 95%
rename from src/test/java/net/hostsharing/hsadminng/test/scenarios/JsonOptional.java
rename to src/test/java/net/hostsharing/hsadminng/hs/scenarios/JsonOptional.java
index c4f3a71e..f5c829c6 100644
--- a/src/test/java/net/hostsharing/hsadminng/test/scenarios/JsonOptional.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/JsonOptional.java
@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.test.scenarios;
+package net.hostsharing.hsadminng.hs.scenarios;
 
 
 public final class JsonOptional<V> {
diff --git a/src/test/java/net/hostsharing/hsadminng/test/scenarios/PathAssertion.java b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/PathAssertion.java
similarity index 85%
rename from src/test/java/net/hostsharing/hsadminng/test/scenarios/PathAssertion.java
rename to src/test/java/net/hostsharing/hsadminng/hs/scenarios/PathAssertion.java
index fec91e2a..4a51932e 100644
--- a/src/test/java/net/hostsharing/hsadminng/test/scenarios/PathAssertion.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/PathAssertion.java
@@ -1,10 +1,10 @@
-package net.hostsharing.hsadminng.test.scenarios;
+package net.hostsharing.hsadminng.hs.scenarios;
 
-import net.hostsharing.hsadminng.test.scenarios.UseCase.HttpResponse;
+import net.hostsharing.hsadminng.hs.scenarios.UseCase.HttpResponse;
 
 import java.util.function.Consumer;
 
-import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
+import static net.hostsharing.hsadminng.hs.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class PathAssertion {
diff --git a/src/test/java/net/hostsharing/hsadminng/test/scenarios/Produces.java b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/Produces.java
similarity index 96%
rename from src/test/java/net/hostsharing/hsadminng/test/scenarios/Produces.java
rename to src/test/java/net/hostsharing/hsadminng/hs/scenarios/Produces.java
index 7ad5bb9c..181d6648 100644
--- a/src/test/java/net/hostsharing/hsadminng/test/scenarios/Produces.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/Produces.java
@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.test.scenarios;
+package net.hostsharing.hsadminng.hs.scenarios;
 
 import lombok.experimental.UtilityClass;
 
diff --git a/src/test/java/net/hostsharing/hsadminng/test/scenarios/README.md b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/README.md
similarity index 100%
rename from src/test/java/net/hostsharing/hsadminng/test/scenarios/README.md
rename to src/test/java/net/hostsharing/hsadminng/hs/scenarios/README.md
diff --git a/src/test/java/net/hostsharing/hsadminng/test/scenarios/Requires.java b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/Requires.java
similarity index 84%
rename from src/test/java/net/hostsharing/hsadminng/test/scenarios/Requires.java
rename to src/test/java/net/hostsharing/hsadminng/hs/scenarios/Requires.java
index fa691c31..d0a3ed5a 100644
--- a/src/test/java/net/hostsharing/hsadminng/test/scenarios/Requires.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/Requires.java
@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.test.scenarios;
+package net.hostsharing.hsadminng.hs.scenarios;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/src/test/java/net/hostsharing/hsadminng/test/scenarios/ScenarioTest.java b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/ScenarioTest.java
similarity index 97%
rename from src/test/java/net/hostsharing/hsadminng/test/scenarios/ScenarioTest.java
rename to src/test/java/net/hostsharing/hsadminng/hs/scenarios/ScenarioTest.java
index 3364554f..d1da4bb1 100644
--- a/src/test/java/net/hostsharing/hsadminng/test/scenarios/ScenarioTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/ScenarioTest.java
@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.test.scenarios;
+package net.hostsharing.hsadminng.hs.scenarios;
 
 import lombok.SneakyThrows;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
@@ -6,7 +6,7 @@ import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonRepository;
 import net.hostsharing.hsadminng.lambda.Reducer;
 import net.hostsharing.hsadminng.rbac.context.ContextBasedTest;
 import net.hostsharing.hsadminng.rbac.test.JpaAttempt;
-import net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver;
+import net.hostsharing.hsadminng.hs.scenarios.TemplateResolver.Resolver;
 import org.apache.commons.collections4.SetUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.jetbrains.annotations.NotNull;
@@ -30,8 +30,8 @@ import java.util.stream.Stream;
 
 import static java.util.Arrays.stream;
 import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.test.scenarios.Produces.Aggregator.producedAliases;
-import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
+import static net.hostsharing.hsadminng.hs.scenarios.Produces.Aggregator.producedAliases;
+import static net.hostsharing.hsadminng.hs.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test/java/net/hostsharing/hsadminng/test/scenarios/TemplateResolver.java b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/TemplateResolver.java
similarity index 98%
rename from src/test/java/net/hostsharing/hsadminng/test/scenarios/TemplateResolver.java
rename to src/test/java/net/hostsharing/hsadminng/hs/scenarios/TemplateResolver.java
index 27ecc4cf..d28adb26 100644
--- a/src/test/java/net/hostsharing/hsadminng/test/scenarios/TemplateResolver.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/TemplateResolver.java
@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.test.scenarios;
+package net.hostsharing.hsadminng.hs.scenarios;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -10,7 +10,7 @@ import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
+import static net.hostsharing.hsadminng.hs.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
 
 public class TemplateResolver {
 
diff --git a/src/test/java/net/hostsharing/hsadminng/test/scenarios/TemplateResolverUnitTest.java b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/TemplateResolverUnitTest.java
similarity index 93%
rename from src/test/java/net/hostsharing/hsadminng/test/scenarios/TemplateResolverUnitTest.java
rename to src/test/java/net/hostsharing/hsadminng/hs/scenarios/TemplateResolverUnitTest.java
index babdb32e..34e2783f 100644
--- a/src/test/java/net/hostsharing/hsadminng/test/scenarios/TemplateResolverUnitTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/TemplateResolverUnitTest.java
@@ -1,10 +1,10 @@
-package net.hostsharing.hsadminng.test.scenarios;
+package net.hostsharing.hsadminng.hs.scenarios;
 
 import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
-import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
+import static net.hostsharing.hsadminng.hs.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class TemplateResolverUnitTest {
diff --git a/src/test/java/net/hostsharing/hsadminng/test/scenarios/TestReport.java b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/TestReport.java
similarity index 99%
rename from src/test/java/net/hostsharing/hsadminng/test/scenarios/TestReport.java
rename to src/test/java/net/hostsharing/hsadminng/hs/scenarios/TestReport.java
index 6dd39447..b700d556 100644
--- a/src/test/java/net/hostsharing/hsadminng/test/scenarios/TestReport.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/TestReport.java
@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.test.scenarios;
+package net.hostsharing.hsadminng.hs.scenarios;
 
 import lombok.SneakyThrows;
 import net.hostsharing.hsadminng.system.SystemProcess;
diff --git a/src/test/java/net/hostsharing/hsadminng/test/scenarios/UseCase.java b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/UseCase.java
similarity index 98%
rename from src/test/java/net/hostsharing/hsadminng/test/scenarios/UseCase.java
rename to src/test/java/net/hostsharing/hsadminng/hs/scenarios/UseCase.java
index 283058e7..7b438134 100644
--- a/src/test/java/net/hostsharing/hsadminng/test/scenarios/UseCase.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/UseCase.java
@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.test.scenarios;
+package net.hostsharing.hsadminng.hs.scenarios;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -35,8 +35,8 @@ import java.util.function.Supplier;
 
 import static java.net.URLEncoder.encode;
 import static java.util.stream.Collectors.joining;
-import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
-import static net.hostsharing.hsadminng.test.scenarios.TemplateResolver.Resolver.KEEP_COMMENTS;
+import static net.hostsharing.hsadminng.hs.scenarios.TemplateResolver.Resolver.DROP_COMMENTS;
+import static net.hostsharing.hsadminng.hs.scenarios.TemplateResolver.Resolver.KEEP_COMMENTS;
 import static net.hostsharing.hsadminng.test.DebuggerDetection.isDebuggerAttached;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.fail;
diff --git a/src/test/java/net/hostsharing/hsadminng/test/scenarios/UseCaseNotImplementedYet.java b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/UseCaseNotImplementedYet.java
similarity index 88%
rename from src/test/java/net/hostsharing/hsadminng/test/scenarios/UseCaseNotImplementedYet.java
rename to src/test/java/net/hostsharing/hsadminng/hs/scenarios/UseCaseNotImplementedYet.java
index 7f323165..98073e65 100644
--- a/src/test/java/net/hostsharing/hsadminng/test/scenarios/UseCaseNotImplementedYet.java
+++ b/src/test/java/net/hostsharing/hsadminng/hs/scenarios/UseCaseNotImplementedYet.java
@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.test.scenarios;
+package net.hostsharing.hsadminng.hs.scenarios;
 
 import static org.assertj.core.api.Assumptions.assumeThat;