diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDependencyUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDependencyUnitTest.java
index d2b7a7a0..125b7f33 100644
--- a/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDependencyUnitTest.java
+++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDependencyUnitTest.java
@@ -21,8 +21,6 @@ import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.modulith.core.ArchitecturallyEvidentType;
-import org.springframework.modulith.core.Classes;
 import org.springframework.modulith.core.ApplicationModule.QualifiedDependency;
 
 import com.tngtech.archunit.core.domain.JavaClass;
diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDetectionStrategyUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDetectionStrategyUnitTest.java
index 1e16a836..8c684733 100644
--- a/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDetectionStrategyUnitTest.java
+++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleDetectionStrategyUnitTest.java
@@ -18,10 +18,6 @@ package org.springframework.modulith.core;
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.modulith.core.ApplicationModuleDetectionStrategies;
-import org.springframework.modulith.core.ApplicationModuleDetectionStrategy;
-import org.springframework.modulith.core.Classes;
-import org.springframework.modulith.core.JavaPackage;
 
 import com.tngtech.archunit.core.importer.ClassFileImporter;
 import com.tngtech.archunit.core.importer.ImportOption;
diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleUnitTest.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleUnitTest.java
index 65d70f7a..154e8c64 100644
--- a/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleUnitTest.java
+++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ModuleUnitTest.java
@@ -24,11 +24,6 @@ import javax.sql.DataSource;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
-import org.springframework.modulith.core.ApplicationModule;
-import org.springframework.modulith.core.Classes;
-import org.springframework.modulith.core.EventType;
-import org.springframework.modulith.core.JavaPackage;
-import org.springframework.modulith.core.SpringBean;
 
 import com.acme.withatbean.TestEvents.JMoleculesAnnotated;
 import com.acme.withatbean.TestEvents.JMoleculesImplementing;
diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/core/TestUtils.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/TestUtils.java
index 0bbed474..32e0ce38 100644
--- a/spring-modulith-core/src/test/java/org/springframework/modulith/core/TestUtils.java
+++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/TestUtils.java
@@ -19,8 +19,6 @@ import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*;
 
 import org.jmolecules.ddd.annotation.AggregateRoot;
 import org.springframework.data.repository.Repository;
-import org.springframework.modulith.core.ApplicationModules;
-import org.springframework.modulith.core.Classes;
 import org.springframework.util.Assert;
 
 import com.tngtech.archunit.base.DescribedPredicate;
diff --git a/spring-modulith-core/src/test/java/org/springframework/modulith/core/ViolationsUnitTests.java b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ViolationsUnitTests.java
index fa8e9fa9..e2da8aea 100644
--- a/spring-modulith-core/src/test/java/org/springframework/modulith/core/ViolationsUnitTests.java
+++ b/spring-modulith-core/src/test/java/org/springframework/modulith/core/ViolationsUnitTests.java
@@ -18,7 +18,6 @@ package org.springframework.modulith.core;
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.modulith.core.Violations;
 
 /**
  * Unit tests for {@link Violations}.
diff --git a/spring-modulith-integration-test/src/test/java/com/acme/myproject/ModulithTest.java b/spring-modulith-integration-test/src/test/java/com/acme/myproject/ModulithTest.java
index 9b26de81..f2eb38c5 100644
--- a/spring-modulith-integration-test/src/test/java/com/acme/myproject/ModulithTest.java
+++ b/spring-modulith-integration-test/src/test/java/com/acme/myproject/ModulithTest.java
@@ -21,9 +21,9 @@ import org.junit.jupiter.api.Test;
 import org.springframework.modulith.core.ApplicationModule;
 import org.springframework.modulith.core.ApplicationModuleDependencies;
 import org.springframework.modulith.core.ApplicationModules;
+import org.springframework.modulith.core.ApplicationModules.Filters;
 import org.springframework.modulith.core.DependencyType;
 import org.springframework.modulith.core.Violations;
-import org.springframework.modulith.core.ApplicationModules.Filters;
 
 import com.acme.myproject.invalid.InvalidComponent;
 import com.acme.myproject.moduleB.internal.InternalComponentB;
diff --git a/spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java b/spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java
index 646f560d..9955b99b 100644
--- a/spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java
+++ b/spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleB/ModuleBTest.java
@@ -24,8 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.ApplicationContext;
-import org.springframework.modulith.test.TestUtils;
 import org.springframework.modulith.test.ApplicationModuleTest.BootstrapMode;
+import org.springframework.modulith.test.TestUtils;
 
 import com.acme.myproject.NonVerifyingModuleTest;
 import com.acme.myproject.moduleA.ServiceComponentA;
diff --git a/spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java b/spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java
index b1e016b3..98b97d42 100644
--- a/spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java
+++ b/spring-modulith-integration-test/src/test/java/com/acme/myproject/moduleC/ModuleCTest.java
@@ -21,8 +21,8 @@ import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.modulith.test.TestUtils;
 import org.springframework.modulith.test.ApplicationModuleTest.BootstrapMode;
+import org.springframework.modulith.test.TestUtils;
 
 import com.acme.myproject.NonVerifyingModuleTest;
 import com.acme.myproject.moduleA.ServiceComponentA;
diff --git a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/ApplicationModulesIntegrationTest.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/ApplicationModulesIntegrationTest.java
index ceeccc84..662e0398 100644
--- a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/ApplicationModulesIntegrationTest.java
+++ b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/ApplicationModulesIntegrationTest.java
@@ -23,12 +23,6 @@ import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.modulith.core.ApplicationModule;
-import org.springframework.modulith.core.ApplicationModules;
-import org.springframework.modulith.core.DependencyType;
-import org.springframework.modulith.core.NamedInterface;
-import org.springframework.modulith.core.NamedInterfaces;
-import org.springframework.modulith.core.Violations;
 
 import com.acme.myproject.Application;
 import com.acme.myproject.complex.internal.FirstTypeBasedPort;
diff --git a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/JavaPackageUnitTests.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/JavaPackageUnitTests.java
index 39fc9908..898e4961 100644
--- a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/JavaPackageUnitTests.java
+++ b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/JavaPackageUnitTests.java
@@ -18,8 +18,6 @@ package org.springframework.modulith.core;
 import static org.assertj.core.api.Assertions.*;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.modulith.core.Classes;
-import org.springframework.modulith.core.JavaPackage;
 
 import com.tngtech.archunit.core.domain.JavaClasses;
 import com.tngtech.archunit.core.importer.ClassFileImporter;
diff --git a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/TestModuleDetectionStrategy.java b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/TestModuleDetectionStrategy.java
index 177e3ec7..47362a0c 100644
--- a/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/TestModuleDetectionStrategy.java
+++ b/spring-modulith-integration-test/src/test/java/org/springframework/modulith/core/TestModuleDetectionStrategy.java
@@ -17,9 +17,6 @@ package org.springframework.modulith.core;
 
 import java.util.stream.Stream;
 
-import org.springframework.modulith.core.ApplicationModuleDetectionStrategy;
-import org.springframework.modulith.core.JavaPackage;
-
 /**
  * @author Oliver Drotbohm
  */
diff --git a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java
index 1e379769..3afe698b 100644
--- a/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java
+++ b/spring-modulith-test/src/main/java/org/springframework/modulith/test/ModuleContextCustomizerFactory.java
@@ -88,7 +88,7 @@ class ModuleContextCustomizerFactory implements ContextCustomizerFactory {
 			var bootstrapMode = execution.getBootstrapMode().name();
 
 			var message = "Bootstrapping @%s for %s in mode %s (%s)…"
-					.formatted(ApplicationModuleTest.class.getName(), moduleName, bootstrapMode, modules.getModulithSource());
+					.formatted(ApplicationModuleTest.class.getName(), moduleName, bootstrapMode, modules.getSource());
 
 			LOGGER.info(message);
 			LOGGER.info("");
@@ -101,7 +101,8 @@ class ModuleContextCustomizerFactory implements ContextCustomizerFactory {
 
 				logHeadline("Extra includes:");
 
-				LOGGER.info("> " + extraIncludes.stream().map(ApplicationModule::getName).collect(Collectors.joining(", ")));
+				LOGGER.info("> "
+						+ extraIncludes.stream().map(ApplicationModule::getName).collect(Collectors.joining(", ")));
 			}
 
 			var sharedModules = modules.getSharedModules();
@@ -110,7 +111,8 @@ class ModuleContextCustomizerFactory implements ContextCustomizerFactory {
 
 				logHeadline("Shared modules:");
 
-				LOGGER.info("> " + sharedModules.stream().map(ApplicationModule::getName).collect(Collectors.joining(", ")));
+				LOGGER.info("> "
+						+ sharedModules.stream().map(ApplicationModule::getName).collect(Collectors.joining(", ")));
 			}
 
 			var dependencies = execution.getDependencies();