diff --git a/rewrite-java-test/src/main/java/org/openrewrite/java/JavaTypeGoat.java b/rewrite-java-test/src/main/java/org/openrewrite/java/JavaTypeGoat.java
index a32c6df44c4..8e8abd6fe37 100644
--- a/rewrite-java-test/src/main/java/org/openrewrite/java/JavaTypeGoat.java
+++ b/rewrite-java-test/src/main/java/org/openrewrite/java/JavaTypeGoat.java
@@ -15,6 +15,7 @@
  */
 package org.openrewrite.java;
 
+import java.io.FileNotFoundException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -25,6 +26,8 @@ public abstract class JavaTypeGoat<T, S extends PT<S> & C> {
 
     public static final PT<TypeA> parameterizedField = new PT<TypeA>() {
     };
+    public static final Double PI = 3.14;
+    public static final double PI_PRIMITIVE = 3.14;
 
     public static abstract class InheritedJavaTypeGoat<T, U extends PT<U> & C> extends JavaTypeGoat<T, U> {
         public InheritedJavaTypeGoat() {
@@ -73,6 +76,9 @@ public static class TypeB {}
     public abstract <U extends TypeA & PT<U> & C> U genericIntersection(U n);
     public abstract T genericT(T n); // remove after signatures are common.
     public abstract <U extends Extension<U> & Intersection<U>> void recursiveIntersection(U n);
+    public abstract <T> T nameShadow(T t);
+    public abstract void throwsException() throws FileNotFoundException;
+    public abstract <T extends FileNotFoundException> void throwsGenericException() throws T, InterruptedException;
 }
 
 interface C {
diff --git a/rewrite-java-test/src/main/resources/JavaTypeGoat.java b/rewrite-java-test/src/main/resources/JavaTypeGoat.java
index 61953059cab..40e1696a15a 100644
--- a/rewrite-java-test/src/main/resources/JavaTypeGoat.java
+++ b/rewrite-java-test/src/main/resources/JavaTypeGoat.java
@@ -15,6 +15,7 @@
  */
 package org.openrewrite.java;
 
+import java.io.FileNotFoundException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -25,6 +26,8 @@ public abstract class JavaTypeGoat<T, S extends PT<S> & C> {
 
     public static final PT<TypeA> parameterizedField = new PT<TypeA>() {
     };
+    public static final Double PI = 3.14;
+    public static final double PI_PRIMITIVE = 3.14;
 
     public static abstract class InheritedJavaTypeGoat<T, U extends PT<U> & C> extends JavaTypeGoat<T, U> {
         public InheritedJavaTypeGoat() {
@@ -73,6 +76,9 @@ public static class TypeB {}
     public abstract <U extends TypeA & PT<U> & C> U genericIntersection(U n);
     public abstract T genericT(T n); // remove after signatures are common.
     public abstract <U extends JavaTypeGoat.Extension<U> & Intersection<U>> void recursiveIntersection(U n);
+    public abstract <T> T nameShadow(T t);
+    public abstract void throwsException() throws FileNotFoundException;
+    public abstract <T extends FileNotFoundException> void throwsGenericException() throws T, InterruptedException;
 }
 
 interface C {