diff --git a/Samples/SwiftAndJavaJarFFMSampleLib/src/test/java/com/example/swift/MySwiftLibraryTest.java b/Samples/SwiftAndJavaJarFFMSampleLib/src/test/java/com/example/swift/MySwiftLibraryTest.java
index aac0e6239..6511377c0 100644
--- a/Samples/SwiftAndJavaJarFFMSampleLib/src/test/java/com/example/swift/MySwiftLibraryTest.java
+++ b/Samples/SwiftAndJavaJarFFMSampleLib/src/test/java/com/example/swift/MySwiftLibraryTest.java
@@ -14,7 +14,6 @@
 
 package com.example.swift;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.CountDownLatch;
@@ -34,14 +33,13 @@ void call_globalTakeInt() {
     }
 
     @Test
-    @Disabled("Upcalls not yet implemented in new scheme")
     @SuppressWarnings({"Convert2Lambda", "Convert2MethodRef"})
     void call_globalCallMeRunnable() {
         CountDownLatch countDownLatch = new CountDownLatch(3);
 
-        MySwiftLibrary.globalCallMeRunnable(new MySwiftLibrary.globalCallMeRunnable.run() {
+        MySwiftLibrary.globalCallMeRunnable(new java.lang.Runnable() {
             @Override
-            public void apply() {
+            public void run() {
                 countDownLatch.countDown();
             }
         });
@@ -113,19 +111,19 @@ void call_globalCallMeDoublePredicate_noThrow() {
 
     @Test
     void call_globalCallMeIntUnaryOperator_noThrow() {
-        int result = MySwiftLibrary.globalCallMeIntBinaryOperator((int a) -> { return a; });
+        int result = MySwiftLibrary.globalCallMeIntUnaryOperator((int a) -> { return a; });
         assertEquals(1, result);
     }
 
     @Test
     void call_globalCallMeLongUnaryOperator_noThrow() {
-        long result = MySwiftLibrary.globalCallMeLongBinaryOperator((long a) -> { return a; });
+        long result = MySwiftLibrary.globalCallMeLongUnaryOperator((long a) -> { return a; });
         assertEquals(1L, result);
     }
 
     @Test
     void call_globalCallMeDoubleUnaryOperator_noThrow() {
-        double result = MySwiftLibrary.globalCallMeDoubleBinaryOperator((double a) -> { return a; });
+        double result = MySwiftLibrary.globalCallMeDoubleUnaryOperator((double a) -> { return a; });
         assertEquals(1.0, result);
     }
 
diff --git a/Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/MySwiftClassTest.java b/Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/MySwiftClassTest.java
index 403f74af2..0e99b4418 100644
--- a/Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/MySwiftClassTest.java
+++ b/Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/MySwiftClassTest.java
@@ -14,7 +14,6 @@
 
 package com.example.swift;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.swift.swiftkit.core.SwiftLibraries;
 import org.swift.swiftkit.ffm.AllocatingSwiftArena;
@@ -86,7 +85,6 @@ void test_MySwiftClass_classMembers() {
     }
 
     @Test
-    @Disabled // TODO: Need var mangled names in interfaces
     void test_MySwiftClass_property_x() {
         try(var arena = AllocatingSwiftArena.ofConfined()) {
             MySwiftClass o = MySwiftClass.init(12, 42, arena);
diff --git a/Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/MySwiftLibraryTest.java b/Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/MySwiftLibraryTest.java
index 61ce80ffd..730979196 100644
--- a/Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/MySwiftLibraryTest.java
+++ b/Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/MySwiftLibraryTest.java
@@ -14,7 +14,6 @@
 
 package com.example.swift;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.swift.swiftkit.ffm.generated.SwiftJavaErrorException;
 
@@ -76,7 +75,6 @@ void call_globalStringIdentity_empty() {
     }
 
     @Test
-    @Disabled("Upcalls not yet implemented in new scheme")
     @SuppressWarnings({"Convert2Lambda", "Convert2MethodRef"})
     void call_globalCallMeRunnable() {
         CountDownLatch countDownLatch = new CountDownLatch(3);