diff --git a/lib/koans/18_genservers.ex b/lib/koans/18_genservers.ex
index 8e78761..0c3440e 100644
--- a/lib/koans/18_genservers.ex
+++ b/lib/koans/18_genservers.ex
@@ -135,15 +135,11 @@ defmodule GenServers do
 
   koan "Our server works but it's pretty ugly to use; so lets use a cleaner interface" do
     Laptop.start_link("EL!73")
-    assert Laptop.unlock("EL!73") == ___
-  end
 
-  koan "Let's use the remaining functions in the external API" do
-    Laptop.start_link("EL!73")
-    {_, response} = Laptop.unlock("EL!73")
-    assert response == ___
+    assert Laptop.unlock("EL!73") == ___
 
     Laptop.change_password("EL!73", "Elixir")
+
     {_, response} = Laptop.unlock("EL!73")
     assert response == ___
 
diff --git a/test/koans/genservers_koans_test.exs b/test/koans/genservers_koans_test.exs
index 3a6569e..57ddd74 100644
--- a/test/koans/genservers_koans_test.exs
+++ b/test/koans/genservers_koans_test.exs
@@ -11,8 +11,7 @@ defmodule GenServersTests do
       "73x7!n9",
       {:error, "Incorrect password!"},
       "Congrats! Your process was successfully named.",
-      {:ok, "Laptop unlocked!"},
-      {:multiple, ["Laptop unlocked!", "Incorrect password!", "Jack Sparrow"]}
+      {:multiple, [{:ok, "Laptop unlocked!"}, "Incorrect password!", "Jack Sparrow"]}
     ]
 
     test_all(GenServers, answers)