14 files changed, 132 insertions, 128 deletions
diff --git a/test/result_test.gleam b/test/result_test.gleam
deleted file mode 100644
index 36d208e..0000000
--- a/test/result_test.gleam
+++ /dev/null
@@ -1,85 +0,0 @@
-import expect
-import result
-
-pub fn is_ok_test() {
-  result:is_ok(Ok(1)) |> expect:true
-  result:is_ok(Error(1)) |> expect:false
-}
-
-pub fn is_error_test() {
-  result:is_error(Ok(1))
-    |> expect:false
-
-  result:is_error(Error(1))
-    |> expect:true
-}
-
-pub fn map_test() {
-  Ok(1)
-    |> result:map(_, fn(x) { x + 1 })
-    |> expect:equal(_, Ok(2))
-
-  Ok(1)
-    |> result:map(_, fn(_) { "2" })
-    |> expect:equal(_, Ok("2"))
-
-  Error(1)
-    |> result:map(_, fn(x) { x + 1 })
-    |> expect:equal(_, Error(1))
-}
-
-pub fn map_error_test() {
-  Ok(1)
-    |> result:map_error(_, fn(x) { x + 1 })
-    |> expect:equal(_, Ok(1))
-
-  Error(1)
-    |> result:map_error(_, fn(x) { x + 1 })
-    |> expect:equal(_, Error(2))
-}
-
-pub fn flatten_test() {
-  Ok(Ok(1))
-    |> result:flatten
-    |> expect:equal(_, Ok(1))
-
-  Ok(Error(1))
-    |> result:flatten
-    |> expect:equal(_, Error(1))
-
-  Error(1)
-    |> result:flatten
-    |> expect:equal(_, Error(1))
-
-  Error(Error(1))
-    |> result:flatten
-    |> expect:equal(_, Error(Error(1)))
-}
-
-pub fn then_test() {
-  Error(1)
-    |> result:then(_, fn(x) { Ok(x + 1) })
-    |> expect:equal(_, Error(1))
-
-  Ok(1)
-    |> result:then(_, fn(x) { Ok(x + 1) })
-    |> expect:equal(_, Ok(2))
-
-  Ok(1)
-    |> result:then(_, fn(_) { Ok("type change") })
-    |> expect:equal(_, Ok("type change"))
-
-  Ok(1)
-    |> result:then(_, fn(_) { Error(1) })
-    |> expect:equal(_, Error(1))
-}
-
-pub fn unwrap_test() {
-  Ok(1)
-    |> result:unwrap(_, 50)
-    |> expect:equal(_, 1)
-
-  Error("nope")
-    |> result:unwrap(_, 50)
-    |> expect:equal(_, 50)
-}
diff --git a/test/any_test.gleam b/test/std/any_test.gleam
index 9c9d236..dce4a44 100644
--- a/test/any_test.gleam
+++ b/test/std/any_test.gleam
@@ -1,9 +1,9 @@
-import any
-import atom
-import list
-import tuple
-import expect
-import result
+import std/any
+import std/atom
+import std/list
+import std/tuple
+import std/expect
+import std/result
 
 pub fn string_test() {
   ""
diff --git a/test/atom_test.gleam b/test/std/atom_test.gleam
index 60686ab..54e88da 100644
--- a/test/atom_test.gleam
+++ b/test/std/atom_test.gleam
@@ -1,5 +1,5 @@
-import atom
-import expect
+import std/atom
+import std/expect
 
 pub fn from_string_test() {
   "ok"
diff --git a/test/bool_test.gleam b/test/std/bool_test.gleam
index 412989f..d2da7f9 100644
--- a/test/bool_test.gleam
+++ b/test/std/bool_test.gleam
@@ -1,6 +1,6 @@
-import bool
-import order
-import expect
+import std/bool
+import std/order
+import std/expect
 
 pub fn negate_test() {
   bool:negate(True)
diff --git a/test/float_test.gleam b/test/std/float_test.gleam
index db879b8..0847973 100644
--- a/test/float_test.gleam
+++ b/test/std/float_test.gleam
@@ -1,5 +1,5 @@
-import expect
-import float
+import std/expect
+import std/float
 
 pub fn parse_test() {
   "1.23"
diff --git a/test/http_test.gleam b/test/std/http_test.gleam
index 9941d56..9941d56 100644
--- a/test/http_test.gleam
+++ b/test/std/http_test.gleam
diff --git a/test/int_test.gleam b/test/std/int_test.gleam
index 77f48ba..63e9d50 100644
--- a/test/int_test.gleam
+++ b/test/std/int_test.gleam
@@ -1,6 +1,6 @@
-import expect
-import int
-import order
+import std/expect
+import std/int
+import std/order
 
 pub fn to_string() {
   123
diff --git a/test/iodata_test.gleam b/test/std/iodata_test.gleam
index e57c8cc..1a90e51 100644
--- a/test/iodata_test.gleam
+++ b/test/std/iodata_test.gleam
@@ -1,5 +1,5 @@
-import expect
-import iodata
+import std/expect
+import std/iodata
 
 pub fn iodata_test() {
   let data = iodata:new("ello")
diff --git a/test/list_test.gleam b/test/std/list_test.gleam
index 32484da..9e27d22 100644
--- a/test/list_test.gleam
+++ b/test/std/list_test.gleam
@@ -1,7 +1,7 @@
-import expect
-import list
-import int
-import str
+import std/expect
+import std/list
+import std/int
+import std/string
 
 pub fn length_test() {
   list:length([]) |> expect:equal(_, 0)
@@ -273,7 +273,7 @@ pub fn index_map_test() {
   |> expect:equal(_, [{0, 3}, {1, 4}, {2, 5}])
 
   let f = fn(i, x) {
-    str:append(x, int:to_string(i))
+    string:append(x, int:to_string(i))
   }
   list:index_map(["a", "b", "c"], f)
   |> expect:equal(_, ["a0", "b1", "c2"])
diff --git a/test/map_dict_test.gleam b/test/std/map_dict_test.gleam
index 6ff9133..892bc5d 100644
--- a/test/map_dict_test.gleam
+++ b/test/std/map_dict_test.gleam
@@ -1,6 +1,6 @@
-import expect
-import map_dict
-import str
+import std/string
+import std/expect
+import std/map_dict
 
 pub fn from_list_test() {
   [
@@ -220,7 +220,7 @@ pub fn fold_test() {
   |> expect:equal(_, 6)
 
   let concat = fn(k, _, acc) {
-    str:append(acc, k)
+    string:append(acc, k)
   }
 
   dict
diff --git a/test/order_test.gleam b/test/std/order_test.gleam
index 35ba0bd..aac0aae 100644
--- a/test/order_test.gleam
+++ b/test/std/order_test.gleam
@@ -1,5 +1,5 @@
-import expect
-import order
+import std/expect
+import std/order
 
 pub fn reverse_test() {
   order:reverse(order:Lt)
diff --git a/test/std/result_test.gleam b/test/std/result_test.gleam
new file mode 100644
index 0000000..41fd808
--- /dev/null
+++ b/test/std/result_test.gleam
@@ -0,0 +1,88 @@
+import std/expect
+import std/result
+
+pub fn is_ok_test() {
+  result:is_ok(Ok(1))
+  |> expect:true
+
+  result:is_ok(Error(1))
+  |> expect:false
+}
+
+pub fn is_error_test() {
+  result:is_error(Ok(1))
+  |> expect:false
+
+  result:is_error(Error(1))
+  |> expect:true
+}
+
+pub fn map_test() {
+  Ok(1)
+  |> result:map(_, fn(x) { x + 1 })
+  |> expect:equal(_, Ok(2))
+
+  Ok(1)
+  |> result:map(_, fn(_) { "2" })
+  |> expect:equal(_, Ok("2"))
+
+  Error(1)
+  |> result:map(_, fn(x) { x + 1 })
+  |> expect:equal(_, Error(1))
+}
+
+pub fn map_error_test() {
+  Ok(1)
+  |> result:map_error(_, fn(x) { x + 1 })
+  |> expect:equal(_, Ok(1))
+
+  Error(1)
+  |> result:map_error(_, fn(x) { x + 1 })
+  |> expect:equal(_, Error(2))
+}
+
+pub fn flatten_test() {
+  Ok(Ok(1))
+  |> result:flatten
+  |> expect:equal(_, Ok(1))
+
+  Ok(Error(1))
+  |> result:flatten
+  |> expect:equal(_, Error(1))
+
+  Error(1)
+  |> result:flatten
+  |> expect:equal(_, Error(1))
+
+  Error(Error(1))
+  |> result:flatten
+  |> expect:equal(_, Error(Error(1)))
+}
+
+pub fn then_test() {
+  Error(1)
+  |> result:then(_, fn(x) { Ok(x + 1) })
+  |> expect:equal(_, Error(1))
+
+  Ok(1)
+  |> result:then(_, fn(x) { Ok(x + 1) })
+  |> expect:equal(_, Ok(2))
+
+  Ok(1)
+  |> result:then(_, fn(_) { Ok("type change") })
+  |> expect:equal(_, Ok("type change"))
+
+  Ok(1)
+  |> result:then(_, fn(_) { Error(1) })
+  |> expect:equal(_, Error(1))
+}
+
+pub fn unwrap_test() {
+  Ok(1)
+  |> result:unwrap(_, 50)
+  |> expect:equal(_, 1)
+
+  Error("nope")
+  |> result:unwrap(_, 50)
+  |> expect:equal(_, 50)
+}
diff --git a/test/str_test.gleam b/test/std/string_test.gleam
index 5d0d6ba..dd8a00e 100644
--- a/test/str_test.gleam
+++ b/test/std/string_test.gleam
@@ -1,49 +1,50 @@
-import str
-import expect
+import std/string
+import std/expect
 
 pub fn length_test() {
-  str:length("ß↑e̊")
+  string:length("ß↑e̊")
   |> expect:equal(_, 3)
 
-  str:length("Gleam")
+  string:length("Gleam")
   |> expect:equal(_, 5)
 
-  str:length("")
+  string:length("")
   |> expect:equal(_, 0)
 }
 
 pub fn lowercase_test() {
-  str:lowercase("Gleam")
+  string:lowercase("Gleam")
   |> expect:equal(_, "gleam")
 }
 
 pub fn uppercase_test() {
-  str:uppercase("Gleam")
+  string:uppercase("Gleam")
   |> expect:equal(_, "GLEAM")
 }
 
 pub fn reverse_test() {
-  str:reverse("Gleam")
+  string:reverse("Gleam")
   |> expect:equal(_, "maelG")
 }
 
 pub fn split_test() {
   "Gleam,Erlang,Elixir"
-  |> str:split(_, ",")
+  |> string:split(_, ",")
   |> expect:equal(_, ["Gleam", "Erlang", "Elixir"])
 
   "Gleam, Erlang,Elixir"
-  |> str:split(_, ", ")
+  |> string:split(_, ", ")
   |> expect:equal(_, ["Gleam", "Erlang,Elixir"])
 }
 
 pub fn replace_test() {
   "Gleam,Erlang,Elixir"
-  |> str:replace(_, ",", "++")
+  |> string:replace(_, ",", "++")
   |> expect:equal(_, "Gleam++Erlang++Elixir")
 }
 
 pub fn append_test() {
-  str:append("Test", " Me")
+  "Test"
+  |> string:append(_, " Me")
   |> expect:equal(_, "Test Me")
 }
diff --git a/test/tuple_test.gleam b/test/std/tuple_test.gleam
index 1c0463a..31f1179 100644
--- a/test/tuple_test.gleam
+++ b/test/std/tuple_test.gleam
@@ -1,5 +1,5 @@
-import expect
-import tuple
+import std/expect
+import std/tuple
 
 pub fn new_test() {
   tuple:new(1, 2)