2 files changed, 18 insertions, 8 deletions
diff --git a/src/test/java/org/shedlang/compiler/config/GcConfigTests.java b/src/test/java/org/shedlang/compiler/config/GcConfigTests.java
index 892faec9..6803cf70 100644
--- a/src/test/java/org/shedlang/compiler/config/GcConfigTests.java
+++ b/src/test/java/org/shedlang/compiler/config/GcConfigTests.java
@@ -4,6 +4,8 @@ import org.junit.jupiter.api.Test;
 import org.shedlang.compiler.config.toml.TomlTableWithSource;
 import org.shedlang.compiler.sources.Sources;
 
+import java.util.OptionalLong;
+
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.zwobble.precisely.AssertThat.assertThat;
 import static org.zwobble.precisely.Matchers.*;
@@ -56,7 +58,7 @@ public class GcConfigTests {
 
         assertThat(config, instanceOf(
             GcMarkAndSweepConfig.class,
-            has("collectInterval", x -> x.collectInterval(), isOptionalOf(equalTo(10000L)))
+            has("collectInterval", x -> x.collectInterval(), equalTo(OptionalLong.of(10000L)))
         ));
     }
 }
diff --git a/src/test/java/org/shedlang/compiler/config/GcMarkAndSweepConfigTests.java b/src/test/java/org/shedlang/compiler/config/GcMarkAndSweepConfigTests.java
index 120d279a..91d0d234 100644
--- a/src/test/java/org/shedlang/compiler/config/GcMarkAndSweepConfigTests.java
+++ b/src/test/java/org/shedlang/compiler/config/GcMarkAndSweepConfigTests.java
@@ -1,34 +1,42 @@
 package org.shedlang.compiler.config;
 
 import org.junit.jupiter.api.Test;
-import org.tomlj.Toml;
+import org.shedlang.compiler.config.toml.TomlTableWithSource;
+import org.shedlang.compiler.sources.Sources;
+
+import java.util.OptionalLong;
 
 import static org.zwobble.precisely.AssertThat.assertThat;
-import static org.zwobble.precisely.Matchers.*;
+import static org.zwobble.precisely.Matchers.equalTo;
+import static org.zwobble.precisely.Matchers.has;
 
 public class GcMarkAndSweepConfigTests {
     @Test
     public void collectIntervalCanBeMissing() {
-        var config = GcMarkAndSweepConfig.fromToml(Toml.parse(""));
+        var source = Sources.string("");
+
+        var config = GcMarkAndSweepConfig.fromToml(TomlTableWithSource.parse(source));
 
         assertThat(config, has(
             "collectInterval",
             x -> x.collectInterval(),
-            isOptionalEmpty()
+            equalTo(OptionalLong.empty())
         ));
     }
 
     @Test
     public void additionalFieldsCanBeUsedBySpecificGcConfig() {
-        var config = GcMarkAndSweepConfig.fromToml(Toml.parse("""
+        var source = Sources.string("""
             name = "mark-and-sweep"
             collect-interval = 10000
-            """));
+            """);
+
+        var config = GcMarkAndSweepConfig.fromToml(TomlTableWithSource.parse(source));
 
         assertThat(config, has(
             "collectInterval",
             x -> x.collectInterval(),
-            isOptionalOf(equalTo(10000L))
+            equalTo(OptionalLong.of(10000L))
         ));
     }
 }