diff --git a/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListener.java b/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListener.java
index f792337b..7e389710 100644
--- a/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListener.java
+++ b/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListener.java
@@ -108,11 +108,10 @@ private Map<TestData, List<TestData>> matchTestCasesToSuites_locked(
       // In all cases we're looking for the "class" segment, pull the UniqueID and map that from the
       // results
       List<UniqueId.Segment> segments = testCase.getId().getUniqueIdObject().getSegments();
-      
+
       if (segments.size() == 2) {
         parent = results.get(testCase.getId().getUniqueIdObject());
-      }
-      else if (segments.size() == 3 || segments.size() == 5) {
+      } else if (segments.size() == 3 || segments.size() == 5) {
         // get class / test data up one level
         parent =
             testCase
@@ -164,6 +163,8 @@ private List<TestData> findTestCases_locked() {
               // are identified by the fact that they have no child test cases in the
               // test plan, or they are marked as tests.
               TestIdentifier id = result.getId();
+              System.out.println(id);
+              System.out.println(testPlan.getChildren(id));
               return id.getSource() != null || id.isTest() || testPlan.getChildren(id).isEmpty();
             })
         .collect(Collectors.toList());
diff --git a/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestData.java b/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestData.java
index 7047e7b1..c16fa0e9 100644
--- a/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestData.java
+++ b/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestData.java
@@ -149,14 +149,22 @@ public Instant getStarted() {
 
   @Override
   public String toString() {
-    return "TestData{" +
-        "id=" + id +
-        ", reportEntries=" + reportEntries +
-        ", started=" + started +
-        ", finished=" + finished +
-        ", reason='" + reason + '\'' +
-        ", result=" + result +
-        ", dynamic=" + dynamic +
-        '}';
+    return "TestData{"
+        + "id="
+        + id
+        + ", reportEntries="
+        + reportEntries
+        + ", started="
+        + started
+        + ", finished="
+        + finished
+        + ", reason='"
+        + reason
+        + '\''
+        + ", result="
+        + result
+        + ", dynamic="
+        + dynamic
+        + '}';
   }
 }