diff --git a/lib/elixir/test/elixir/keyword_test.exs b/lib/elixir/test/elixir/keyword_test.exs
index bb7a78a02de..aeff96a5303 100644
--- a/lib/elixir/test/elixir/keyword_test.exs
+++ b/lib/elixir/test/elixir/keyword_test.exs
@@ -1,9 +1,9 @@
-Code.require_file "test_helper.exs", __DIR__
+Code.require_file("test_helper.exs", __DIR__)
 
 defmodule KeywordTest do
   use ExUnit.Case, async: true
 
-  doctest Keyword
+  doctest(Keyword)
 
   test "has a literal syntax" do
     assert [B: 1] == [{:B, 1}]
@@ -13,66 +13,83 @@ defmodule KeywordTest do
   end
 
   test "is a :: operator on ambiguity" do
-    assert [{:::, _, [{:a, _, _}, {:b, _, _}]}] = quote(do: [a::b])
+    assert [{:::, _, [{:a, _, _}, {:b, _, _}]}] = quote(do: [a :: b])
   end
 
   test "supports optional comma" do
-    [a: 1,
-     b: 2,
-     c: 3,]
+    [a: 1, b: 2, c: 3]
   end
 
   test "implements (almost) all functions in Map" do
-    assert Map.__info__(:functions) -- Keyword.__info__(:functions) ==
-           [from_struct: 1]
+    assert Map.__info__(:functions) -- Keyword.__info__(:functions) == [from_struct: 1]
   end
 
   test "get_and_update/3 raises on bad return value from the argument function" do
-    assert_raise RuntimeError, "the given function must return a two-element tuple or :pop, got: 1", fn ->
+    message = "the given function must return a two-element tuple or :pop, got: 1"
+
+    assert_raise RuntimeError, message, fn ->
       Keyword.get_and_update([a: 1], :a, fn value -> value end)
     end
 
-    assert_raise RuntimeError, "the given function must return a two-element tuple or :pop, got: nil", fn ->
+    message = "the given function must return a two-element tuple or :pop, got: nil"
+
+    assert_raise RuntimeError, message, fn ->
       Keyword.get_and_update([], :a, fn value -> value end)
     end
   end
 
   test "get_and_update!/3 raises on bad return value from the argument function" do
-    assert_raise RuntimeError, "the given function must return a two-element tuple or :pop, got: 1", fn ->
+    message = "the given function must return a two-element tuple or :pop, got: 1"
+
+    assert_raise RuntimeError, message, fn ->
       Keyword.get_and_update!([a: 1], :a, fn value -> value end)
     end
   end
 
   test "merge/2" do
-    assert Keyword.merge([a: 1, b: 2], [c: 11, d: 12]) == [a: 1, b: 2, c: 11, d: 12]
-    assert Keyword.merge([], [c: 11, d: 12]) == [c: 11, d: 12]
+    assert Keyword.merge([a: 1, b: 2], c: 11, d: 12) == [a: 1, b: 2, c: 11, d: 12]
+    assert Keyword.merge([], c: 11, d: 12) == [c: 11, d: 12]
     assert Keyword.merge([a: 1, b: 2], []) == [a: 1, b: 2]
 
-    assert_raise ArgumentError, "expected a keyword list as the first argument, got: [1, 2]", fn ->
-      Keyword.merge([1, 2], [c: 11, d: 12])
+    message = "expected a keyword list as the first argument, got: [1, 2]"
+
+    assert_raise ArgumentError, message, fn ->
+      Keyword.merge([1, 2], c: 11, d: 12)
     end
 
-    assert_raise ArgumentError, "expected a keyword list as the first argument, got: [1 | 2]", fn ->
-      Keyword.merge([1 | 2], [c: 11, d: 12])
+    message = "expected a keyword list as the first argument, got: [1 | 2]"
+
+    assert_raise ArgumentError, message, fn ->
+      Keyword.merge([1 | 2], c: 11, d: 12)
     end
 
-    assert_raise ArgumentError, "expected a keyword list as the second argument, got: [11, 12, 0]", fn ->
+    message = "expected a keyword list as the second argument, got: [11, 12, 0]"
+
+    assert_raise ArgumentError, message, fn ->
       Keyword.merge([a: 1, b: 2], [11, 12, 0])
     end
 
-    assert_raise ArgumentError, "expected a keyword list as the second argument, got: [11 | 12]", fn ->
+    message = "expected a keyword list as the second argument, got: [11 | 12]"
+
+    assert_raise ArgumentError, message, fn ->
       Keyword.merge([a: 1, b: 2], [11 | 12])
     end
 
     # duplicate keys in keywords1 are kept if key is not present in keywords2
-    assert Keyword.merge([a: 1, b: 2, a: 3], [c: 11, d: 12]) == [a: 1, b: 2, a: 3, c: 11, d: 12]
-    assert Keyword.merge([a: 1, b: 2, a: 3], [a: 11]) == [b: 2, a: 11]
+    assert Keyword.merge([a: 1, b: 2, a: 3], c: 11, d: 12) == [a: 1, b: 2, a: 3, c: 11, d: 12]
+    assert Keyword.merge([a: 1, b: 2, a: 3], a: 11) == [b: 2, a: 11]
 
     # duplicate keys in keywords2 are always kept
-    assert Keyword.merge([a: 1, b: 2], [c: 11, c: 12, d: 13]) == [a: 1, b: 2, c: 11, c: 12, d: 13]
+    assert Keyword.merge([a: 1, b: 2], c: 11, c: 12, d: 13) == [a: 1, b: 2, c: 11, c: 12, d: 13]
 
     # any key in keywords1 is removed if key is present in keyword2
-    assert Keyword.merge([a: 1, b: 2, c: 3, c: 4], [c: 11, c: 12, d: 13]) == [a: 1, b: 2, c: 11, c: 12, d: 13]
+    assert Keyword.merge([a: 1, b: 2, c: 3, c: 4], c: 11, c: 12, d: 13) == [
+             a: 1,
+             b: 2,
+             c: 11,
+             c: 12,
+             d: 13
+           ]
   end
 
   test "merge/3" do
@@ -82,35 +99,64 @@ defmodule KeywordTest do
     assert Keyword.merge([], [c: 11, d: 12], fun) == [c: 11, d: 12]
     assert Keyword.merge([a: 1, b: 2], [], fun) == [a: 1, b: 2]
 
-    assert_raise ArgumentError, "expected a keyword list as the first argument, got: [1, 2]", fn ->
+    message = "expected a keyword list as the first argument, got: [1, 2]"
+
+    assert_raise ArgumentError, message, fn ->
       Keyword.merge([1, 2], [c: 11, d: 12], fun)
     end
 
-    assert_raise ArgumentError, "expected a keyword list as the first argument, got: [1 | 2]", fn ->
+    message = "expected a keyword list as the first argument, got: [1 | 2]"
+
+    assert_raise ArgumentError, message, fn ->
       Keyword.merge([1 | 2], [c: 11, d: 12], fun)
     end
 
-    assert_raise ArgumentError, "expected a keyword list as the second argument, got: [{:x, 1}, :y, :z]", fn ->
+    message = "expected a keyword list as the second argument, got: [{:x, 1}, :y, :z]"
+
+    assert_raise ArgumentError, message, fn ->
       Keyword.merge([a: 1, b: 2], [{:x, 1}, :y, :z], fun)
     end
 
-    assert_raise ArgumentError, "expected a keyword list as the second argument, got: [:x | :y]", fn ->
+    message = "expected a keyword list as the second argument, got: [:x | :y]"
+
+    assert_raise ArgumentError, message, fn ->
       Keyword.merge([a: 1, b: 2], [:x | :y], fun)
     end
 
-    assert_raise ArgumentError, "expected a keyword list as the second argument, got: [{:x, 1} | :y]", fn ->
+    message = "expected a keyword list as the second argument, got: [{:x, 1} | :y]"
+
+    assert_raise ArgumentError, message, fn ->
       Keyword.merge([a: 1, b: 2], [{:x, 1} | :y], fun)
     end
 
     # duplicate keys in keywords1 are left untouched if key is not present in keywords2
-    assert Keyword.merge([a: 1, b: 2, a: 3], [c: 11, d: 12], fun) == [a: 1, b: 2, a: 3, c: 11, d: 12]
+    assert Keyword.merge([a: 1, b: 2, a: 3], [c: 11, d: 12], fun) == [
+             a: 1,
+             b: 2,
+             a: 3,
+             c: 11,
+             d: 12
+           ]
+
     assert Keyword.merge([a: 1, b: 2, a: 3], [a: 11], fun) == [b: 2, a: 12]
 
     # duplicate keys in keywords2 are always kept
-    assert Keyword.merge([a: 1, b: 2], [c: 11, c: 12, d: 13], fun) == [a: 1, b: 2, c: 11, c: 12, d: 13]
+    assert Keyword.merge([a: 1, b: 2], [c: 11, c: 12, d: 13], fun) == [
+             a: 1,
+             b: 2,
+             c: 11,
+             c: 12,
+             d: 13
+           ]
 
     # every key in keywords1 is replaced with fun result if key is present in keyword2
-    assert Keyword.merge([a: 1, b: 2, c: 3, c: 4], [c: 11, c: 50, d: 13], fun) == [a: 1, b: 2, c: 14, c: 54, d: 13]
+    assert Keyword.merge([a: 1, b: 2, c: 3, c: 4], [c: 11, c: 50, d: 13], fun) == [
+             a: 1,
+             b: 2,
+             c: 14,
+             c: 54,
+             d: 13
+           ]
   end
 
   test "merge/2 and merge/3 behave exactly the same way" do
@@ -123,7 +169,7 @@ defmodule KeywordTest do
       {[a: 1, b: 2, a: 3], [c: 11, d: 12]},
       {[a: 1, b: 2, a: 3], [a: 11]},
       {[a: 1, b: 2], [c: 11, c: 12, d: 13]},
-      {[a: 1, b: 2, c: 3, c: 4], [c: 11, c: 12, d: 13]},
+      {[a: 1, b: 2, c: 3, c: 4], [c: 11, c: 12, d: 13]}
     ]
 
     args_error = [
@@ -133,7 +179,7 @@ defmodule KeywordTest do
       {[a: 1, b: 2], [11 | 12]},
       {[a: 1, b: 2], [{:x, 1}, :y, :z]},
       {[a: 1, b: 2], [:x | :y]},
-      {[a: 1, b: 2], [{:x, 1} | :y]},
+      {[a: 1, b: 2], [{:x, 1} | :y]}
     ]
 
     for {arg1, arg2} <- args do