diff --git a/runtime-jvm/main/src/test/scala/util/SequenceTests.scala b/runtime-jvm/main/src/test/scala/util/SequenceTests.scala
index 8d31fd099..65bdb300a 100644
--- a/runtime-jvm/main/src/test/scala/util/SequenceTests.scala
+++ b/runtime-jvm/main/src/test/scala/util/SequenceTests.scala
@@ -50,7 +50,7 @@ object SequenceTests {
   }
 
   def sizes(implicit T: Env) =
-    Vector.range(0,100) :+ intIn(150,200) :+ intIn(500,1000) :+ intIn(1000,4000) :+ intIn(4000,8000)
+    Vector.range(0,100) :+ intIn(150,200) :+ intIn(500,2000)
 
   def seqOf(size: Int): Test[Sequence[Int]] = test { implicit T =>
     if (size <= 0) S.empty
diff --git a/unison-src/tests/fib4.u b/unison-src/tests/fib4.u
index 34cc0617e..e0ea74f96 100644
--- a/unison-src/tests/fib4.u
+++ b/unison-src/tests/fib4.u
@@ -1,7 +1,7 @@
-(+) = (+_UInt64)
-(<) = (<_UInt64)
+(+) = (UInt64.+)
+(<) = (UInt64.<)
 (-) = (UInt64.drop)
-(*) = (*_UInt64)
+(*) = (UInt64.*)
 
 fib4 n =
   loop a b c d n = case n of
diff --git a/unison-src/tests/stream-shouldnt-damage-stack.u b/unison-src/tests/stream-shouldnt-damage-stack.u
index 1560cb5ca..4c48e1c9f 100644
--- a/unison-src/tests/stream-shouldnt-damage-stack.u
+++ b/unison-src/tests/stream-shouldnt-damage-stack.u
@@ -1,6 +1,6 @@
-(+) = (+_UInt64)
+(+) = (UInt64.+)
 (-) = UInt64.drop
-(*) = (*_UInt64)
+(*) = (UInt64.*)
 
 eat-stack n = case n of
   0 -> 0
diff --git a/unison-src/tests/stream/append.u b/unison-src/tests/stream/append.u
index 7aa29f372..086a43911 100644
--- a/unison-src/tests/stream/append.u
+++ b/unison-src/tests/stream/append.u
@@ -1,5 +1,5 @@
 (++) = Stream.append
-sum = Stream.reduce 0 (+_UInt64)
+sum = Stream.reduce 0 (UInt64.+)
 left = Stream.take 3 (Stream.from-uint64 5)
 right = Stream.take 10 (Stream.from-uint64 100)
 
diff --git a/unison-src/tests/stream/cons.u b/unison-src/tests/stream/cons.u
index a417244f7..8246e91ae 100644
--- a/unison-src/tests/stream/cons.u
+++ b/unison-src/tests/stream/cons.u
@@ -1,5 +1,5 @@
 reduce = Stream.reduce
-(+) = (+_UInt64)
+(+) = (UInt64.+)
 take = Stream.take
 cons = Stream.cons
 from = Stream.from-uint64
diff --git a/unison-src/tests/stream/foldleft-uint64.u b/unison-src/tests/stream/foldleft-uint64.u
index b4ba9488a..c4a9ad1a4 100644
--- a/unison-src/tests/stream/foldleft-uint64.u
+++ b/unison-src/tests/stream/foldleft-uint64.u
@@ -1,4 +1,4 @@
 a |> f = f a
 Stream.from-uint64 0
   |> Stream.take 10
-  |> Stream.fold-left 0 (b a -> a +_UInt64 b)
+  |> Stream.fold-left 0 (b a -> a UInt64.+ b)
diff --git a/unison-src/tests/stream/fromint64-take-foldleft-plus.u b/unison-src/tests/stream/fromint64-take-foldleft-plus.u
index e5c09a2ab..2a9bc07bd 100644
--- a/unison-src/tests/stream/fromint64-take-foldleft-plus.u
+++ b/unison-src/tests/stream/fromint64-take-foldleft-plus.u
@@ -1,4 +1,4 @@
 a |> f = f a
 Stream.from-uint64 0
   |> Stream.take 10000
-  |> Stream.fold-left 0 (+_UInt64)
+  |> Stream.fold-left 0 (UInt64.+)
diff --git a/unison-src/tests/stream/iterate-increment-take-drop-reduce.u b/unison-src/tests/stream/iterate-increment-take-drop-reduce.u
index 88df34291..25acadd70 100644
--- a/unison-src/tests/stream/iterate-increment-take-drop-reduce.u
+++ b/unison-src/tests/stream/iterate-increment-take-drop-reduce.u
@@ -1,4 +1,4 @@
-(+) = (+_Int64)
+(+) = (Int64.+)
 a |> f = f a
 Stream.iterate +0 Int64.increment
   |> Stream.take 5
diff --git a/unison-src/tests/stream/iterate-increment-take-filter-reduce.u b/unison-src/tests/stream/iterate-increment-take-filter-reduce.u
index 4bd5a8da2..5c8dbe342 100644
--- a/unison-src/tests/stream/iterate-increment-take-filter-reduce.u
+++ b/unison-src/tests/stream/iterate-increment-take-filter-reduce.u
@@ -2,4 +2,4 @@ a |> f = f a
 Stream.iterate 0 UInt64.increment
   |> Stream.take 10000
   |> Stream.filter UInt64.is-even
-  |> Stream.reduce 0 (+_UInt64)
+  |> Stream.reduce 0 (UInt64.+)
diff --git a/unison-src/tests/stream/scan-left.u b/unison-src/tests/stream/scan-left.u
index 76477147e..8b41fa37f 100644
--- a/unison-src/tests/stream/scan-left.u
+++ b/unison-src/tests/stream/scan-left.u
@@ -1,5 +1,5 @@
 a |> f = f a
 Stream.from-uint64 1
   |> Stream.take 10000
-  |> Stream.scan-left 0 (+_UInt64)
-  |> Stream.reduce 0 (+_UInt64)
+  |> Stream.scan-left 0 (UInt64.+)
+  |> Stream.reduce 0 (UInt64.+)
diff --git a/unison-src/tests/stream/takewhile-dropwhile-zipwith.u b/unison-src/tests/stream/takewhile-dropwhile-zipwith.u
index 0a58dbdd1..a0ac90198 100644
--- a/unison-src/tests/stream/takewhile-dropwhile-zipwith.u
+++ b/unison-src/tests/stream/takewhile-dropwhile-zipwith.u
@@ -1,6 +1,6 @@
 a |> f = f a
-(*) = (*_UInt64)
-(<) = (<_UInt64)
+(*) = (UInt64.*)
+(<) = (UInt64.<)
 
 left = Stream.from-uint64 0 |> Stream.take-while (n -> n < 10)
 right = Stream.from-uint64 77 |> Stream.drop-while (n -> n < 103)
diff --git a/unison-src/tests/stream/unfold.u b/unison-src/tests/stream/unfold.u
index fc63a6f9d..20aedcc27 100644
--- a/unison-src/tests/stream/unfold.u
+++ b/unison-src/tests/stream/unfold.u
@@ -1,6 +1,6 @@
-(+) = (+_Int64)
-(/) = (/_Int64)
-(<) = (<_Int64)
+(+) = (Int64.+)
+(/) = (Int64./)
+(<) = (Int64.<)
 Stream.to-sequence
   (Stream.take 5
     (Stream.unfold
diff --git a/unison-src/tests/tuple.u b/unison-src/tests/tuple.u
index 7113a3f39..998167ec4 100644
--- a/unison-src/tests/tuple.u
+++ b/unison-src/tests/tuple.u
@@ -1,3 +1,3 @@
-(+) = (+_UInt64)
+(+) = (UInt64.+)
 case (1,2,3,4) of
   (a,b,c,d) -> (a + b, c + d)