diff --git a/src/main/java/org/javamodularity/moduleplugin/TestEngine.java b/src/main/java/org/javamodularity/moduleplugin/TestEngine.java
index 713c95b..92ad100 100644
--- a/src/main/java/org/javamodularity/moduleplugin/TestEngine.java
+++ b/src/main/java/org/javamodularity/moduleplugin/TestEngine.java
@@ -12,7 +12,6 @@
 
 public enum TestEngine {
     JUNIT_4("junit", "junit", "junit", "junit"),
-<<<<<<< HEAD
     JUNIT_5_API("org.junit.jupiter", ".*", "org.junit.jupiter.api", "org.junit.platform.commons"),
     JUNIT_5("org.junit.jupiter", ".*", "org.junit.jupiter.api", "org.junit.jupiter.api"),
     JUNIT_5_PARAMS("org.junit.jupiter", "junit-jupiter-params", "org.junit.jupiter.params", "org.junit.platform.commons"),
diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/ModuleInfoTestHelper.java b/src/main/java/org/javamodularity/moduleplugin/tasks/ModuleInfoTestHelper.java
index cd54e62..9040843 100644
--- a/src/main/java/org/javamodularity/moduleplugin/tasks/ModuleInfoTestHelper.java
+++ b/src/main/java/org/javamodularity/moduleplugin/tasks/ModuleInfoTestHelper.java
@@ -22,12 +22,12 @@ static void mutateArgs(Project project, Consumer<String> consumer) {
 
         var files = testSourceSet.getAllSource().matching(f -> f.include("module-info.test"));
         if (files.isEmpty()) {
-            LOGGER.debug("File 'module-info.test' is not present in {}", project);
+            LOGGER.info("File 'module-info.test' is not present in {}", project);
             return;
         }
 
         var moduleInfoTestPath = files.getSingleFile().toPath();
-        LOGGER.debug("Using lines of '{}' to patch module {}...", moduleInfoTestPath, moduleName);
+        LOGGER.info("Using lines of '{}' to patch module {}...", moduleInfoTestPath, moduleName);
         try (var lines = Files.lines(moduleInfoTestPath)) {
             lines.map(String::trim)
                     .filter(line -> !line.isEmpty())
diff --git a/src/main/java/org/javamodularity/moduleplugin/tasks/TestTask.java b/src/main/java/org/javamodularity/moduleplugin/tasks/TestTask.java
index 01b4cb1..9fcc5d6 100644
--- a/src/main/java/org/javamodularity/moduleplugin/tasks/TestTask.java
+++ b/src/main/java/org/javamodularity/moduleplugin/tasks/TestTask.java
@@ -53,6 +53,7 @@ public void execute(Task task) {
 
                 List<String> args = buildJvmArgs(testJava, testModuleOptions);
                 testJava.setJvmArgs(args);
+                LOGGER.info("jvmArgs for task {}: {}", task.getName(), args);
                 testJava.setClasspath(project.files());
             }
         });
diff --git a/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java b/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java
index 5618afe..ac0fb1d 100644
--- a/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java
+++ b/src/test/java/org/javamodularity/moduleplugin/ModulePluginSmokeTest.java
@@ -38,7 +38,7 @@ void before() throws IOException {
 
     @CartesianProductTest(name = "smokeTest({arguments})")
     @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
-    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-milestone-3"})
+    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-rc-1"})
     void smokeTest(String projectName, String gradleVersion) {
         LOGGER.info("Executing smokeTest with Gradle {}", gradleVersion);
         var result = GradleRunner.create()
@@ -61,7 +61,7 @@ void smokeTest(String projectName, String gradleVersion) {
     @CartesianProductTest(name = "smokeTestRun({arguments})")
     @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
     // Fails with Gradle versions >= 6.6. See https://github.com/java9-modularity/gradle-modules-plugin/issues/165
-    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1"/*, "6.8.3", "7.0-milestone-3"*/})
+    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1"/*, "6.8.3", "7.0-rc-1"*/})
     void smokeTestRun(String projectName, String gradleVersion) {
         LOGGER.info("Executing smokeTestRun with Gradle {}", gradleVersion);
         var writer = new StringWriter(256);
@@ -85,7 +85,7 @@ void smokeTestRun(String projectName, String gradleVersion) {
 
     @CartesianProductTest(name = "smokeTestJunit5({arguments})")
     @CartesianValueSource(strings = {"5.4.2/1.4.2", "5.5.2/1.5.2", "5.7.1/1.7.1"})
-    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-milestone-3"})
+    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-rc-1"})
     void smokeTestJunit5(String junitVersionPair, String gradleVersion) {
         LOGGER.info("Executing smokeTestJunit5 with Gradle {}", gradleVersion);
         var junitVersionParts = junitVersionPair.split("/");
@@ -107,7 +107,7 @@ void smokeTestJunit5(String junitVersionPair, String gradleVersion) {
 
     @CartesianProductTest(name = "smokeTestMixed({arguments})")
     // It currently fails with Gradle 7.0
-    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3"/*, "7.0-milestone-3"*/})
+    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3"/*, "7.0-rc-1"*/})
     void smokeTestMixed(String gradleVersion) {
         LOGGER.info("Executing smokeTestMixed with Gradle {}", gradleVersion);
         var result = GradleRunner.create()
@@ -159,7 +159,7 @@ private static void assertExpectedClassFileFormats(
 
     @CartesianProductTest(name = "smokeTestDist({arguments})")
     @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
-    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-milestone-3"})
+    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-rc-1"})
     void smokeTestDist(String projectName, String gradleVersion) {
         LOGGER.info("Executing smokeTestDist with Gradle {}", gradleVersion);
         var result = GradleRunner.create()
@@ -199,7 +199,7 @@ void smokeTestDist(String projectName, String gradleVersion) {
 
     @CartesianProductTest(name = "smokeTestRunDemo({arguments})")
     @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
-    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-milestone-3"})
+    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1", "6.8.3", "7.0-rc-1"})
     void smokeTestRunDemo(String projectName, String gradleVersion) {
         LOGGER.info("Executing smokeTestRunDemo with Gradle {}", gradleVersion);
         var result = GradleRunner.create()
@@ -217,7 +217,7 @@ void smokeTestRunDemo(String projectName, String gradleVersion) {
     @CartesianProductTest(name = "smokeTestRunStartScripts({arguments})")
     @CartesianValueSource(strings = {"test-project", "test-project-kotlin", "test-project-groovy"})
     // Fails with Gradle versions >= 6.6. See https://github.com/java9-modularity/gradle-modules-plugin/issues/165
-    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1"/*, "6.8.3", "7.0-milestone-3"*/})
+    @CartesianValueSource(strings = {"5.1", "5.6", "6.3", "6.4.1", "6.5.1"/*, "6.8.3", "7.0-rc-1"*/})
     void smokeTestRunStartScripts(String projectName, String gradleVersion) {
         LOGGER.info("Executing smokeTestRunScripts with Gradle {}", gradleVersion);
         var result = GradleRunner.create()