diff --git a/.github/actions/install-wasi-sdk/action.yml b/.github/actions/install-wasi-sdk/action.yml
index 5b0798a59..bca070a87 100644
--- a/.github/actions/install-wasi-sdk/action.yml
+++ b/.github/actions/install-wasi-sdk/action.yml
@@ -4,7 +4,7 @@ description: 'Install the wasi-sdk toolchain'
 inputs:
   version:
     description: "Wasi-sdk version to install"
-    default: "30"
+    default: "34"
 
 runs:
   using: composite
@@ -34,8 +34,8 @@ runs:
     - name: Setup `wasm-tools`
       uses: bytecodealliance/actions/wasm-tools/setup@v1
       with:
-        version: "1.252.0"
+        version: "1.258.0"
     - name: Setup `wasmtime`
       uses: bytecodealliance/actions/wasmtime/setup@v1
       with:
-        version: "46.0.1"
+        version: "48.0.1"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6b9a4a3c7..7b01b1973 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -103,6 +103,10 @@ jobs:
       with:
         dotnet-version: '9.x'
       if: matrix.lang == 'csharp'
+    - uses: ./.github/actions/install-wasi-sdk
+      if: matrix.lang == 'csharp'
+      with:
+        version: 29
 
     # As of this writing async tests require [a patched build of
     # Go](https://github.com/dicej/go/releases/tag/go1.25.5-wasi-on-idle).
diff --git a/tests/runtime/lists/runner.cpp b/tests/runtime/lists/runner.cpp
index 497e4b5bf..e5296c78a 100644
--- a/tests/runtime/lists/runner.cpp
+++ b/tests/runtime/lists/runner.cpp
@@ -1,7 +1,9 @@
 #include <assert.h>
+#include <cmath>
 #include <limits.h>
 #include <float.h>
 #include <runner_cpp.h>
+#include <vector>
 
 static bool equal(wit::string const&a, std::string_view b) {
     return a.get_view() == b;
@@ -22,18 +24,6 @@ static bool equal(std::span<R> const&a, std::span<S> const& b) {
     return true;
 }
 template<class R>
-static bool equal(wit::vector<R> const&a, std::span<R> const& b) {
-    return equal(a.get_view(), b);
-}
-template<class R>
-static bool equal(std::span<const R> const&a, wit::vector<R> const& b) {
-    return equal(b, a);
-}
-template<class R>
-static bool equal(std::span<const R> const&a, std::vector<R> const& b) {
-    return equal(a, std::span<R>(b));
-}
-template<class R>
 static bool equal(wit::vector<R> const&a, std::vector<R> const& b) {
     return equal(a.get_view(), std::span<R const>(b));
 }
@@ -45,11 +35,6 @@ static bool equal(std::tuple<R,S> const&a, std::tuple<T,U> const& b) {
     return equal(std::get<0>(a), std::get<0>(b)) && equal(std::get<1>(a), std::get<1>(b));
 }
 
-template <class T>
-static bool equal(T const& a, T const& b) {
-    return a==b;
-}
-
 void exports::runner::Run()
 {
     using namespace ::test::lists::to_test;
diff --git a/tests/runtime/lists/test.cpp b/tests/runtime/lists/test.cpp
index f05016fff..2334166a0 100644
--- a/tests/runtime/lists/test.cpp
+++ b/tests/runtime/lists/test.cpp
@@ -2,6 +2,7 @@
 #include <test_cpp.h>
 #include <float.h>
 #include <math.h>
+#include <vector>
 
 uint32_t exports::test::lists::to_test::AllocatedBytes() {
     return 0;
@@ -20,25 +21,9 @@ static bool equal(std::span<R> const&a, std::span<S> const& b) {
     return true;
 }
 template<class R>
-static bool equal(wit::vector<R> const&a, std::span<R> const& b) {
-    return equal(a.get_view(), b);
-}
-template<class R>
-static bool equal(std::span<const R> const&a, wit::vector<R> const& b) {
-    return equal(b, a);
-}
-template<class R>
-static bool equal(std::span<const R> const&a, std::vector<R> const& b) {
-    return equal(a, std::span<const R>(b));
-}
-template<class R>
 static bool equal(wit::vector<R> const&a, std::vector<R> const& b) {
     return equal(a.get_view(), std::span<R const>(b));
 }
-template<class R,class S, class T, class U>
-static bool equal(std::tuple<R,S> const&a, std::tuple<T,U> const& b) {
-    return equal(std::get<0>(a), std::get<0>(b)) && equal(std::get<1>(a), std::get<1>(b));
-}
 
 static bool equal(wit::string const& a, std::string_view b) {
     return a.get_view() == b;
diff --git a/tests/runtime/numbers/runner.cpp b/tests/runtime/numbers/runner.cpp
index 6bbe6b52f..f855d876c 100644
--- a/tests/runtime/numbers/runner.cpp
+++ b/tests/runtime/numbers/runner.cpp
@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <cmath>
 #include <limits.h>
 #include <runner_cpp.h>
 
diff --git a/tests/runtime/resource_borrow_in_record/runner.cpp b/tests/runtime/resource_borrow_in_record/runner.cpp
index 40fd96c4c..ed34b68ae 100644
--- a/tests/runtime/resource_borrow_in_record/runner.cpp
+++ b/tests/runtime/resource_borrow_in_record/runner.cpp
@@ -1,4 +1,5 @@
 #include <runner_cpp.h>
+#include <array>
 
 namespace test_imports = ::test::resource_borrow_in_record::to_test;
 #include <iostream>
diff --git a/tests/runtime/results/runner.cpp b/tests/runtime/results/runner.cpp
index b8a25c2c6..a086361e6 100644
--- a/tests/runtime/results/runner.cpp
+++ b/tests/runtime/results/runner.cpp
@@ -30,16 +30,6 @@ static bool equal(std::expected<T, U> const& a, std::expected<T, U> const& b) {
         return equal(a.error(), b.error());
     }
 }
-template <class U>
-static bool equal(std::expected<void, U> const& a, std::expected<void, U> const& b) {
-    if (a.has_value()) {
-        if (!b.has_value()) return false;
-        return true;
-    } else {
-        if (b.has_value()) return false;
-        return equal(a.error(), b.error());
-    }
-}
 static bool equal(std::expected<void, wit::string> const& a, std::expected<void, std::string_view> const& b) {
     if (a.has_value()) {
         if (!b.has_value()) return false;
diff --git a/tests/runtime/variants/runner.cpp b/tests/runtime/variants/runner.cpp
index 1f1a17428..47c3deb79 100644
--- a/tests/runtime/variants/runner.cpp
+++ b/tests/runtime/variants/runner.cpp
@@ -110,16 +110,6 @@ static bool equal(std::expected<void, U> const& a, std::expected<void, U> const&
     }
 }
 template <class T>
-static bool equal(std::expected<T, wit::string> const& a, std::expected<T, std::string_view> const& b) {
-    if (a.has_value()) {
-        if (!b.has_value()) return false;
-        return equal(*a, *b);
-    } else {
-        if (b.has_value()) return false;
-        return equal(a.error().get_view(), b.error());
-    }
-}
-template <class T>
 static bool equal(std::optional<T> const& a, std::optional<T> const& b) {
     if (a.has_value() != b.has_value()) return false;
     if (a.has_value()) {