diff --git a/appserver/tests/application/src/test/java/org/glassfish/main/test/setup/DeploymentAware.java b/appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/setup/DeploymentAware.java
similarity index 90%
rename from appserver/tests/application/src/test/java/org/glassfish/main/test/setup/DeploymentAware.java
rename to appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/setup/DeploymentAware.java
index dd22bac01f6..86c7d4cf492 100644
--- a/appserver/tests/application/src/test/java/org/glassfish/main/test/setup/DeploymentAware.java
+++ b/appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/setup/DeploymentAware.java
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package org.glassfish.main.test.setup;
+package org.glassfish.main.itest.tools.setup;
 
 import static java.lang.System.Logger.Level.INFO;
 
@@ -24,7 +24,7 @@
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 
 /**
- *
+ * Adds some helper methods as default interface methods related to creating deployments in tests.
  * @author Ondro Mihalyi
  */
 public interface DeploymentAware {
diff --git a/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/resourceref/JtaDataSourceResourceRefTest.java b/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/resourceref/JtaDataSourceResourceRefTest.java
index 71557ef3ea0..f0ada36d50d 100644
--- a/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/resourceref/JtaDataSourceResourceRefTest.java
+++ b/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/resourceref/JtaDataSourceResourceRefTest.java
@@ -34,9 +34,9 @@
 
 import org.glassfish.main.itest.tools.asadmin.Asadmin;
 import org.glassfish.main.itest.tools.asadmin.AsadminResult;
+import org.glassfish.main.itest.tools.setup.DeploymentAware;
 import org.glassfish.main.test.app.persistence.resourceref.webapp.ResourceRefApplication;
 import org.glassfish.main.test.app.persistence.resourceref.webapp.ResourceRefResource;
-import org.glassfish.main.test.setup.DeploymentAware;
 
 /**
  * Tests that JTA datasource in persistence.xml can be a resource reference
diff --git a/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/transform/ClassTransformerEjbWebAppTest.java b/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/transform/ClassTransformerEjbWebAppTest.java
index 9b685527bc3..2998d8f8e2f 100644
--- a/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/transform/ClassTransformerEjbWebAppTest.java
+++ b/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/transform/ClassTransformerEjbWebAppTest.java
@@ -31,8 +31,6 @@
 import static org.glassfish.main.itest.tools.asadmin.AsadminResultMatcher.asadminOK;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
-
 /**
  * Tests bytecode preprocessing in ASURLClassLoader.
  */
diff --git a/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/transform/ClassTransformerTestBase.java b/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/transform/ClassTransformerTestBase.java
index 2e8af4800d6..3bcf8d8a808 100644
--- a/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/transform/ClassTransformerTestBase.java
+++ b/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/transform/ClassTransformerTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023,2024 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -38,7 +38,6 @@
 
 import static org.glassfish.main.itest.tools.GlassFishTestEnvironment.getAsadmin;
 
-
 public class ClassTransformerTestBase {
 
     private static final String PROVIDER_FILE_NAME = "provider.jar";
diff --git a/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/transform/ClassTransformerWebAppTest.java b/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/transform/ClassTransformerWebAppTest.java
index 99f2c7159aa..4949aea3a3f 100644
--- a/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/transform/ClassTransformerWebAppTest.java
+++ b/appserver/tests/application/src/test/java/org/glassfish/main/test/app/persistence/transform/ClassTransformerWebAppTest.java
@@ -21,6 +21,8 @@
 import java.net.HttpURLConnection;
 import java.nio.file.Files;
 
+import org.glassfish.main.test.app.persistence.transform.webapp.ClassTransformerApplication;
+import org.glassfish.main.test.app.persistence.transform.webapp.ClassTransformerResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -33,9 +35,6 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import org.glassfish.main.test.app.persistence.transform.webapp.ClassTransformerApplication;
-import org.glassfish.main.test.app.persistence.transform.webapp.ClassTransformerResource;
-
 /**
  * Tests bytecode preprocessing in WebappClassLoader.
  */
diff --git a/appserver/tests/application/src/test/java/org/glassfish/main/test/app/synchronize/SynchronizeStandaloneInstanceTest.java b/appserver/tests/application/src/test/java/org/glassfish/main/test/app/synchronize/SynchronizeStandaloneInstanceTest.java
index 4d6a966a49d..04c1d5c6e59 100644
--- a/appserver/tests/application/src/test/java/org/glassfish/main/test/app/synchronize/SynchronizeStandaloneInstanceTest.java
+++ b/appserver/tests/application/src/test/java/org/glassfish/main/test/app/synchronize/SynchronizeStandaloneInstanceTest.java
@@ -32,7 +32,6 @@
 import static org.glassfish.main.itest.tools.asadmin.AsadminResultMatcher.asadminOK;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-
 /**
  * Tests synchronization between DAS and standalone instance.
  */
@@ -58,6 +57,7 @@ public static void createInstance() {
         try {
             assertThat(ASADMIN.exec("create-instance", "--node", "localhost-domain1", INSTANCE_NAME), asadminOK());
         } catch (AssertionError e) {
+            // cleanup on error, the instance is not going to be deleted otherwise
             ASADMIN.exec("delete-instance", INSTANCE_NAME);
             throw e;
         }