diff --git a/client/test/client_test/page/login_test.gleam b/client/test/client_test/page/login_test.gleam
index b6f78cc..35b798a 100644
--- a/client/test/client_test/page/login_test.gleam
+++ b/client/test/client_test/page/login_test.gleam
@@ -5,7 +5,7 @@ import lustre/effect
 import rsvp
 import shared/session
 
-pub fn login_submit_test() {
+pub fn submit_test() {
   let user_email = "sigo@email.dev"
   let user_password = "root"
 
@@ -27,7 +27,7 @@ pub fn login_submit_test() {
   assert model.loading
 }
 
-pub fn login_success_test() {
+pub fn auth_success_test() {
   let want = dummy.user()
 
   let model =
@@ -41,7 +41,7 @@ pub fn login_success_test() {
   assert got == want
 }
 
-pub fn login_failure_test() {
+pub fn auth_failure_test() {
   let model =
     Error(rsvp.NetworkError)
     |> login.ApiReturnedSession
diff --git a/client/test/client_test/page/signup_test.gleam b/client/test/client_test/page/signup_test.gleam
index b8f96e9..8452ec7 100644
--- a/client/test/client_test/page/signup_test.gleam
+++ b/client/test/client_test/page/signup_test.gleam
@@ -5,33 +5,7 @@ import lustre/effect
 import rsvp
 import shared/role
 
-pub fn signup_test() {
-  let sequence = [
-    signup.UserTypedName("Wibble"),
-    signup.UserTypedEmail("wibble@lustre.com"),
-    signup.UserTypedPhone("8191234567"),
-    signup.UserTypedPassword("wibble"),
-    signup.UserTypedConfirmPassword("wibble"),
-    signup.UserSelectedRole(role.None),
-    signup.UserClickedSubmit,
-    signup.ApiReturnedResponse(Ok(dummy.user())),
-  ]
-
-  let #(model, _) = {
-    use acc, msg <- list.fold(sequence, #(signup.init, effect.none()))
-    signup.update(acc.0, msg)
-  }
-
-  assert model.user_email == ""
-  assert model.user_name == ""
-  assert model.user_phone == ""
-  assert model.user_password == ""
-  assert model.user_confirm_password == ""
-  assert model.user_role == role.None
-  assert model.loading == False
-}
-
-pub fn signup_submit_test() {
+pub fn submit_test() {
   let user_name = "Wibble"
   let user_email = "wibble@lustre.com"
   let user_phone = "8191234567"
@@ -63,16 +37,54 @@ pub fn signup_submit_test() {
   assert model.loading == True
 }
 
-pub fn signup_success_test() {
-  let msg = signup.ApiReturnedResponse(Ok(dummy.user()))
-  let #(model, _) = signup.update(signup.init, msg)
+pub fn success_test() {
+  let sequence = [
+    signup.UserTypedName("wibble"),
+    signup.UserTypedEmail("wibble@lustre.com"),
+    signup.UserTypedPhone("0000000000"),
+    signup.UserTypedPassword("wibble"),
+    signup.UserTypedConfirmPassword("wibble"),
+    signup.UserSelectedRole(role.None),
+    signup.UserClickedSubmit,
+    signup.ApiReturnedResponse(Ok(dummy.user())),
+  ]
+
+  let #(model, _) = {
+    use acc, msg <- list.fold(sequence, #(signup.init, effect.none()))
+    signup.update(acc.0, msg)
+  }
 
+  assert model.user_email == ""
+  assert model.user_name == ""
+  assert model.user_phone == ""
+  assert model.user_password == ""
+  assert model.user_confirm_password == ""
+  assert model.user_role == role.None
   assert model.loading == False
 }
 
-pub fn signup_failure_test() {
-  let msg = signup.ApiReturnedResponse(Error(rsvp.NetworkError))
-  let #(model, _) = signup.update(signup.init, msg)
+pub fn failure_test() {
+  let sequence = [
+    signup.UserTypedName("wibble"),
+    signup.UserTypedEmail("wibble@lustre.com"),
+    signup.UserTypedPhone("0000000000"),
+    signup.UserTypedPassword("wibble"),
+    signup.UserTypedConfirmPassword("wibble"),
+    signup.UserSelectedRole(role.None),
+    signup.UserClickedSubmit,
+    signup.ApiReturnedResponse(Error(rsvp.NetworkError)),
+  ]
+
+  let #(model, _) = {
+    use acc, msg <- list.fold(sequence, #(signup.init, effect.none()))
+    signup.update(acc.0, msg)
+  }
 
+  assert model.user_email == ""
+  assert model.user_name == ""
+  assert model.user_phone == ""
+  assert model.user_password == ""
+  assert model.user_confirm_password == ""
+  assert model.user_role == role.None
   assert model.loading == False
 }