diff --git a/src/main/scala/com/typesafe/genjavadoc/JavaSig.scala b/src/main/scala/com/typesafe/genjavadoc/JavaSig.scala
index 5c02fe6..46428cc 100644
--- a/src/main/scala/com/typesafe/genjavadoc/JavaSig.scala
+++ b/src/main/scala/com/typesafe/genjavadoc/JavaSig.scala
@@ -105,7 +105,7 @@ trait JavaSig extends NeedsJavaSig { this: TransformCake =>
             if (!primitiveOK) jsig(ObjectClass.tpe)
             else if (sym == UnitClass) jsig(BoxedUnitClass.tpe)
             else toJava(tp)
-          } else if (sym.isClass) {
+          } else if (sym.isClass || sym.isModule) {
             val preRebound = pre.baseType(sym.owner) // #2585
             val name =
               if (needsJavaSig(preRebound)) {
diff --git a/src/test/resources/expected_output/basic/akka/persistence/testkit/EventStorage$.java b/src/test/resources/expected_output/basic/akka/persistence/testkit/EventStorage$.java
new file mode 100644
index 0000000..e6a6fdb
--- /dev/null
+++ b/src/test/resources/expected_output/basic/akka/persistence/testkit/EventStorage$.java
@@ -0,0 +1,8 @@
+package akka.persistence.testkit;
+public  class EventStorage$ {
+  /**
+    * Static reference to the singleton instance of this Scala object.
+    */
+  public static final EventStorage$ MODULE$ = null;
+  public   EventStorage$ ()  { throw new RuntimeException(); }
+}
\ No newline at end of file
diff --git a/src/test/resources/expected_output/basic/akka/persistence/testkit/EventStorage.java b/src/test/resources/expected_output/basic/akka/persistence/testkit/EventStorage.java
new file mode 100644
index 0000000..5a7d4fa
--- /dev/null
+++ b/src/test/resources/expected_output/basic/akka/persistence/testkit/EventStorage.java
@@ -0,0 +1,11 @@
+package akka.persistence.testkit;
+public  interface EventStorage {
+  static public  class JournalPolicies$ implements akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation> {
+    /**
+      * Static reference to the singleton instance of this Scala object.
+      */
+    public static final JournalPolicies$ MODULE$ = null;
+    public   JournalPolicies$ ()  { throw new RuntimeException(); }
+  }
+  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
+}
diff --git a/src/test/resources/expected_output/basic/akka/persistence/testkit/JournalOperation.java b/src/test/resources/expected_output/basic/akka/persistence/testkit/JournalOperation.java
new file mode 100644
index 0000000..7a12ffa
--- /dev/null
+++ b/src/test/resources/expected_output/basic/akka/persistence/testkit/JournalOperation.java
@@ -0,0 +1,3 @@
+package akka.persistence.testkit;
+public  interface JournalOperation {
+}
\ No newline at end of file
diff --git a/src/test/resources/expected_output/basic/akka/persistence/testkit/ProcessingPolicy$.java b/src/test/resources/expected_output/basic/akka/persistence/testkit/ProcessingPolicy$.java
new file mode 100644
index 0000000..d245e3f
--- /dev/null
+++ b/src/test/resources/expected_output/basic/akka/persistence/testkit/ProcessingPolicy$.java
@@ -0,0 +1,8 @@
+package akka.persistence.testkit;
+public  class ProcessingPolicy$ {
+  /**
+    * Static reference to the singleton instance of this Scala object.
+    */
+  public static final ProcessingPolicy$ MODULE$ = null;
+  public   ProcessingPolicy$ ()  { throw new RuntimeException(); }
+}
\ No newline at end of file
diff --git a/src/test/resources/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java b/src/test/resources/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java
new file mode 100644
index 0000000..6b75cd4
--- /dev/null
+++ b/src/test/resources/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java
@@ -0,0 +1,30 @@
+package akka.persistence.testkit;
+public  interface ProcessingPolicy<U extends java.lang.Object> {
+  static public  interface DefaultPolicies<U extends java.lang.Object> {
+    public  class PassAll {
+      static public  java.lang.String productPrefix ()  { throw new RuntimeException(); }
+      static public  int productArity ()  { throw new RuntimeException(); }
+      static public  Object productElement (int x$1)  { throw new RuntimeException(); }
+      static public  scala.collection.Iterator<java.lang.Object> productIterator ()  { throw new RuntimeException(); }
+      static public  boolean canEqual (Object x$1)  { throw new RuntimeException(); }
+      static public  int hashCode ()  { throw new RuntimeException(); }
+      static public  java.lang.String toString ()  { throw new RuntimeException(); }
+      static public abstract  boolean equals (Object that)  ;
+    }
+    public  class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, scala.Serializable {
+      /**
+        * Static reference to the singleton instance of this Scala object.
+        */
+      public static final PassAll$ MODULE$ = null;
+      public   PassAll$ ()  { throw new RuntimeException(); }
+      public  java.lang.String productPrefix ()  { throw new RuntimeException(); }
+      public  int productArity ()  { throw new RuntimeException(); }
+      public  Object productElement (int x$1)  { throw new RuntimeException(); }
+      public  scala.collection.Iterator<java.lang.Object> productIterator ()  { throw new RuntimeException(); }
+      public  boolean canEqual (Object x$1)  { throw new RuntimeException(); }
+      public  int hashCode ()  { throw new RuntimeException(); }
+      public  java.lang.String toString ()  { throw new RuntimeException(); }
+    }
+    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<U>.PassAll$ PassAll ()  ;
+  }
+}
diff --git a/src/test/resources/input/basic/akka/persistence/testkit/EventStorage.scala b/src/test/resources/input/basic/akka/persistence/testkit/EventStorage.scala
new file mode 100644
index 0000000..7171128
--- /dev/null
+++ b/src/test/resources/input/basic/akka/persistence/testkit/EventStorage.scala
@@ -0,0 +1,15 @@
+package akka.persistence.testkit
+
+import akka.persistence.testkit.ProcessingPolicy.DefaultPolicies
+
+private[testkit] trait EventStorage {
+    import EventStorage._
+
+    val DefaultPolicy = JournalPolicies.PassAll
+}
+
+object EventStorage {
+    object JournalPolicies extends DefaultPolicies[JournalOperation]
+}
+
+sealed trait JournalOperation
\ No newline at end of file
diff --git a/src/test/resources/input/basic/akka/persistence/testkit/ProcessingPolicy.scala b/src/test/resources/input/basic/akka/persistence/testkit/ProcessingPolicy.scala
new file mode 100644
index 0000000..584f4c4
--- /dev/null
+++ b/src/test/resources/input/basic/akka/persistence/testkit/ProcessingPolicy.scala
@@ -0,0 +1,11 @@
+package akka.persistence.testkit
+
+trait ProcessingPolicy[U]
+
+object ProcessingPolicy {
+    private[testkit] trait DefaultPolicies[U] {
+        type PolicyType = ProcessingPolicy[U]
+
+        case object PassAll extends PolicyType
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/patches/2.12.10.patch b/src/test/resources/patches/2.12.10.patch
index 940593d..e812eb8 100644
--- a/src/test/resources/patches/2.12.10.patch
+++ b/src/test/resources/patches/2.12.10.patch
@@ -56,3 +56,16 @@
 +    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
    }
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
diff --git a/src/test/resources/patches/2.12.11.patch b/src/test/resources/patches/2.12.11.patch
index 940593d..e812eb8 100644
--- a/src/test/resources/patches/2.12.11.patch
+++ b/src/test/resources/patches/2.12.11.patch
@@ -56,3 +56,16 @@
 +    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
    }
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
diff --git a/src/test/resources/patches/2.12.12.patch b/src/test/resources/patches/2.12.12.patch
index 940593d..e812eb8 100644
--- a/src/test/resources/patches/2.12.12.patch
+++ b/src/test/resources/patches/2.12.12.patch
@@ -56,3 +56,16 @@
 +    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
    }
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
diff --git a/src/test/resources/patches/2.12.3.patch b/src/test/resources/patches/2.12.3.patch
index a2e31c2..61363e7 100644
--- a/src/test/resources/patches/2.12.3.patch
+++ b/src/test/resources/patches/2.12.3.patch
@@ -89,3 +89,16 @@
 +    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
    }
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
diff --git a/src/test/resources/patches/2.12.4.patch b/src/test/resources/patches/2.12.4.patch
index a2e31c2..61363e7 100644
--- a/src/test/resources/patches/2.12.4.patch
+++ b/src/test/resources/patches/2.12.4.patch
@@ -89,3 +89,16 @@
 +    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
    }
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
diff --git a/src/test/resources/patches/2.12.5.patch b/src/test/resources/patches/2.12.5.patch
index a2e31c2..61363e7 100644
--- a/src/test/resources/patches/2.12.5.patch
+++ b/src/test/resources/patches/2.12.5.patch
@@ -89,3 +89,16 @@
 +    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
    }
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
diff --git a/src/test/resources/patches/2.12.6.patch b/src/test/resources/patches/2.12.6.patch
index a2e31c2..61363e7 100644
--- a/src/test/resources/patches/2.12.6.patch
+++ b/src/test/resources/patches/2.12.6.patch
@@ -89,3 +89,16 @@
 +    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
    }
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
diff --git a/src/test/resources/patches/2.12.7.patch b/src/test/resources/patches/2.12.7.patch
index a2e31c2..61363e7 100644
--- a/src/test/resources/patches/2.12.7.patch
+++ b/src/test/resources/patches/2.12.7.patch
@@ -89,3 +89,16 @@
 +    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
    }
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
diff --git a/src/test/resources/patches/2.12.8.patch b/src/test/resources/patches/2.12.8.patch
index a2e31c2..61363e7 100644
--- a/src/test/resources/patches/2.12.8.patch
+++ b/src/test/resources/patches/2.12.8.patch
@@ -89,3 +89,16 @@
 +    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
    }
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
diff --git a/src/test/resources/patches/2.12.9.patch b/src/test/resources/patches/2.12.9.patch
index a2e31c2..61363e7 100644
--- a/src/test/resources/patches/2.12.9.patch
+++ b/src/test/resources/patches/2.12.9.patch
@@ -89,3 +89,16 @@
 +    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
    }
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:04:03.313049968 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
diff --git a/src/test/resources/patches/2.13.0.patch b/src/test/resources/patches/2.13.0.patch
index 016332f..1fcd5c3 100644
--- a/src/test/resources/patches/2.13.0.patch
+++ b/src/test/resources/patches/2.13.0.patch
@@ -258,3 +258,31 @@
 -public  interface X extends scala.Serializable, akka.rk.buh.is.it.Y<akka.rk.buh.is.it.A> {
 +public  interface X extends java.io.Serializable, akka.rk.buh.is.it.Y<akka.rk.buh.is.it.A> {
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:20:58.647999228 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:20:58.647999228 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
+--- target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java 2020-03-23 16:20:58.647999228 +0100
++++ target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java 2020-03-23 16:20:58.647999228 +0100
+@@ -10,8 +10,10 @@
+       static public  int hashCode ()  { throw new RuntimeException(); }
+       static public  java.lang.String toString ()  { throw new RuntimeException(); }
+       static public abstract  boolean equals (Object that)  ;
++      static public  java.lang.String productElementName (int n)  { throw new RuntimeException(); }
++      static public  scala.collection.Iterator<java.lang.String> productElementNames ()  { throw new RuntimeException(); }
+     }
+-    public  class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, scala.Serializable {
++    public  class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, java.io.Serializable {
+       /**
+         * Static reference to the singleton instance of this Scala object.
+         */
+
diff --git a/src/test/resources/patches/2.13.1.patch b/src/test/resources/patches/2.13.1.patch
index ab92488..331a5f9 100644
--- a/src/test/resources/patches/2.13.1.patch
+++ b/src/test/resources/patches/2.13.1.patch
@@ -232,3 +232,31 @@
 -public  interface X extends scala.Serializable, akka.rk.buh.is.it.Y<akka.rk.buh.is.it.A> {
 +public  interface X extends java.io.Serializable, akka.rk.buh.is.it.Y<akka.rk.buh.is.it.A> {
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:20:58.647999228 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:20:58.647999228 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
+--- target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java 2020-03-23 16:20:58.647999228 +0100
++++ target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java 2020-03-23 16:20:58.647999228 +0100
+@@ -10,8 +10,10 @@
+       static public  int hashCode ()  { throw new RuntimeException(); }
+       static public  java.lang.String toString ()  { throw new RuntimeException(); }
+       static public abstract  boolean equals (Object that)  ;
++      static public  java.lang.String productElementName (int n)  { throw new RuntimeException(); }
++      static public  scala.collection.Iterator<java.lang.String> productElementNames ()  { throw new RuntimeException(); }
+     }
+-    public  class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, scala.Serializable {
++    public  class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, java.io.Serializable {
+       /**
+         * Static reference to the singleton instance of this Scala object.
+         */
+
diff --git a/src/test/resources/patches/2.13.2.patch b/src/test/resources/patches/2.13.2.patch
index ab92488..331a5f9 100644
--- a/src/test/resources/patches/2.13.2.patch
+++ b/src/test/resources/patches/2.13.2.patch
@@ -232,3 +232,31 @@
 -public  interface X extends scala.Serializable, akka.rk.buh.is.it.Y<akka.rk.buh.is.it.A> {
 +public  interface X extends java.io.Serializable, akka.rk.buh.is.it.Y<akka.rk.buh.is.it.A> {
  }
+--- target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:20:58.647999228 +0100
++++ target/expected_output/basic/akka/persistence/testkit/EventStorage.java	2020-03-23 16:20:58.647999228 +0100
+@@ -5,7 +5,9 @@
+       * Static reference to the singleton instance of this Scala object.
+       */
+     public static final JournalPolicies$ MODULE$ = null;
++    public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ PassAll ()  { throw new RuntimeException(); }
+     public   JournalPolicies$ ()  { throw new RuntimeException(); }
+   }
+-  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll$ DefaultPolicy ()  ;
++  public  void akka$persistence$testkit$EventStorage$_setter_$DefaultPolicy_$eq (akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll x$1)  ;
++  public  akka.persistence.testkit.ProcessingPolicy.DefaultPolicies<akka.persistence.testkit.JournalOperation>.PassAll DefaultPolicy ()  ;
+ }
+--- target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java 2020-03-23 16:20:58.647999228 +0100
++++ target/expected_output/basic/akka/persistence/testkit/ProcessingPolicy.java 2020-03-23 16:20:58.647999228 +0100
+@@ -10,8 +10,10 @@
+       static public  int hashCode ()  { throw new RuntimeException(); }
+       static public  java.lang.String toString ()  { throw new RuntimeException(); }
+       static public abstract  boolean equals (Object that)  ;
++      static public  java.lang.String productElementName (int n)  { throw new RuntimeException(); }
++      static public  scala.collection.Iterator<java.lang.String> productElementNames ()  { throw new RuntimeException(); }
+     }
+-    public  class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, scala.Serializable {
++    public  class PassAll$ implements akka.persistence.testkit.ProcessingPolicy<U>, scala.Product, java.io.Serializable {
+       /**
+         * Static reference to the singleton instance of this Scala object.
+         */
+