diff --git a/lib/elixir/lib/kernel.ex b/lib/elixir/lib/kernel.ex
index 1b05e77240..1864e45dbc 100644
--- a/lib/elixir/lib/kernel.ex
+++ b/lib/elixir/lib/kernel.ex
@@ -3160,14 +3160,14 @@ defmodule Kernel do
                 { :error, _ } ->
                   :elixir_aliases.ensure_loaded(caller.line, caller.file, atom, caller.context_modules)
                 _ ->
-                  raise "cannot use module #{inspect atom} in access protocol because it does not export __record__/1"
+                  raise ArgumentError, message: "cannot use module #{inspect atom} in access protocol because it does not export __record__/1"
               end
           end
 
         Record.access(atom, fields, args, caller)
       false ->
         case caller.in_match? do
-          true  -> raise << "the access protocol cannot be used inside match clauses ",
+          true  -> raise ArgumentError, message: << "the access protocol cannot be used inside match clauses ",
                      "(for example, on the left hand side of a match or in function signatures)" >>
           false -> quote do: Access.access(unquote(element), unquote(args))
         end
diff --git a/lib/elixir/lib/record.ex b/lib/elixir/lib/record.ex
index 2a841399e4..1d3f914696 100644
--- a/lib/elixir/lib/record.ex
+++ b/lib/elixir/lib/record.ex
@@ -368,7 +368,7 @@ defmodule Record do
   @doc false
   def access(atom, fields, keyword, caller) do
     unless is_keyword(keyword) do
-      raise "expected contents inside brackets to be a Keyword"
+      raise ArgumentError, message: "expected contents inside brackets to be a Keyword"
     end
 
     in_match = caller.in_match?
@@ -398,7 +398,7 @@ defmodule Record do
         quote do: { unquote_splicing([atom|match]) }
       _  ->
         keys = lc { key, _ } inlist remaining, do: key
-        raise "record #{inspect atom} does not have the keys: #{inspect keys}"
+        raise ArgumentError, message: "record #{inspect atom} does not have the keys: #{inspect keys}"
     end
   end
 
@@ -418,11 +418,11 @@ defmodule Record do
   @doc false
   defp update(atom, fields, var, keyword, caller) do
     unless is_keyword(keyword) do
-      raise "expected contents inside brackets to be a Keyword"
+      raise ArgumentError, message: "expected contents inside brackets to be a Keyword"
     end
 
     if caller.in_match? do
-      raise "cannot invoke update style macro inside match context"
+      raise ArgumentError, message: "cannot invoke update style macro inside match context"
     end
 
     Enum.reduce keyword, var, fn({ key, value }, acc) ->
@@ -432,7 +432,7 @@ defmodule Record do
           :erlang.setelement(unquote(index + 2), unquote(acc), unquote(value))
         end
       else
-        raise "record #{inspect atom} does not have the key: #{inspect key}"
+        raise ArgumentError, message: "record #{inspect atom} does not have the key: #{inspect key}"
       end
     end
   end
@@ -448,7 +448,7 @@ defmodule Record do
         :erlang.element(unquote(index + 2), unquote(var))
       end
     else
-      raise "record #{inspect atom} does not have the key: #{inspect key}"
+      raise ArgumentError, message: "record #{inspect atom} does not have the key: #{inspect key}"
     end
   end
 
@@ -477,7 +477,7 @@ defmodule Record do
         if index do
           quote do: :erlang.element(unquote(index + 2), unquote(record))
         else
-          raise "record #{inspect atom} does not have the key: #{inspect key}"
+          raise ArgumentError, message: "record #{inspect atom} does not have the key: #{inspect key}"
         end
       end
   end
diff --git a/lib/elixir/src/elixir_def.erl b/lib/elixir/src/elixir_def.erl
index 40f48c5d01..5e083c890a 100644
--- a/lib/elixir/src/elixir_def.erl
+++ b/lib/elixir/src/elixir_def.erl
@@ -309,8 +309,8 @@ store_each(Check, Kind, File, Location, Table, CTable, Defaults, {function, Line
       FinalLocation = StoredLocation,
       FinalDefaults = max(Defaults, StoredDefaults),
       check_valid_kind(Line, File, Name, Arity, Kind, StoredKind),
-      check_valid_defaults(Line, File, Name, Arity, Kind, Defaults, StoredDefaults),
-      (Check and StoredCheck) andalso check_valid_clause(Line, File, Name, Arity, Kind, Table);
+      (Check and StoredCheck) andalso check_valid_clause(Line, File, Name, Arity, Kind, Table),
+      check_valid_defaults(Line, File, Name, Arity, Kind, Defaults, StoredDefaults);
     [] ->
       FinalLine = Line,
       FinalLocation = Location,
@@ -340,7 +340,7 @@ check_valid_defaults(_Line, _File, _Name, _Arity, _Kind, 0, _) -> [];
 check_valid_defaults(Line, File, Name, Arity, Kind, _, 0) ->
   elixir_errors:handle_file_warning(File, { Line, ?MODULE, { out_of_order_defaults, { Kind, Name, Arity } } });
 check_valid_defaults(Line, File, Name, Arity, Kind, _, _) ->
-  elixir_errors:handle_file_warning(File, { Line, ?MODULE, { clauses_with_defaults, { Kind, Name, Arity } } }).
+  elixir_errors:form_error(Line, File, ?MODULE, { clauses_with_defaults, { Kind, Name, Arity } }).
 
 assert_no_aliases_name(Line, '__aliases__', [Atom], #elixir_scope{file=File}) when is_atom(Atom) ->
   Message = "function names should start with lowercase characters or underscore, invalid name ~ts",
diff --git a/lib/elixir/test/elixir/kernel/errors_test.exs b/lib/elixir/test/elixir/kernel/errors_test.exs
index f5df9e937f..b73583ce2d 100644
--- a/lib/elixir/test/elixir/kernel/errors_test.exs
+++ b/lib/elixir/test/elixir/kernel/errors_test.exs
@@ -12,214 +12,375 @@ defmodule Kernel.ErrorsTest do
   defrecord Config, integer: 0
 
   test :invalid_token do
-    assert_compile_fail SyntaxError, "nofile:1: invalid token: \end", '\end\nlol\nbarbecue'
+    assert_compile_fail SyntaxError,
+      "nofile:1: invalid token: \end",
+      '\end\nlol\nbarbecue'
   end
 
   test :sigil_terminator do
-    assert_compile_fail TokenMissingError, "nofile:3: missing terminator: \" (for sigil %r\" starting at line 1)", '%r"foo\n\n'
-    assert_compile_fail TokenMissingError, "nofile:3: missing terminator: } (for sigil %r{ starting at line 1)", '%r{foo\n\n'
+    assert_compile_fail TokenMissingError,
+      "nofile:3: missing terminator: \" (for sigil %r\" starting at line 1)",
+      '%r"foo\n\n'
+
+    assert_compile_fail TokenMissingError,
+      "nofile:3: missing terminator: } (for sigil %r{ starting at line 1)",
+      '%r{foo\n\n'
   end
 
   test :dot_terminator do
-    assert_compile_fail TokenMissingError, "nofile:1: missing terminator: \" (for function name starting at line 1)", 'foo."bar'
+    assert_compile_fail TokenMissingError,
+      "nofile:1: missing terminator: \" (for function name starting at line 1)",
+      'foo."bar'
   end
 
   test :string_terminator do
-    assert_compile_fail TokenMissingError, "nofile:1: missing terminator: \" (for string starting at line 1)", '"bar'
+    assert_compile_fail TokenMissingError,
+      "nofile:1: missing terminator: \" (for string starting at line 1)",
+      '"bar'
   end
 
   test :heredoc_terminator do
-    assert_compile_fail TokenMissingError, "nofile:2: missing terminator: \"\"\" (for heredoc starting at line 1)", '"""\nbar'
+    assert_compile_fail TokenMissingError,
+      "nofile:2: missing terminator: \"\"\" (for heredoc starting at line 1)",
+      '"""\nbar'
   end
 
   test :invalid_partial do
-    assert_compile_fail SyntaxError, "nofile:1: partial variable &2 cannot be defined without &1", '&2 + 3'
+    assert_compile_fail SyntaxError,
+      "nofile:1: partial variable &2 cannot be defined without &1",
+      '&2 + 3'
   end
 
   test :unexpected_end do
-    assert_compile_fail SyntaxError, "nofile:1: unexpected token: end", '1 end'
+    assert_compile_fail SyntaxError,
+      "nofile:1: unexpected token: end",
+      '1 end'
   end
 
   test :syntax_error do
-    assert_compile_fail SyntaxError, "nofile:1: syntax error before: '.'", '+.foo'
+    assert_compile_fail SyntaxError,
+      "nofile:1: syntax error before: '.'",
+      '+.foo'
   end
 
   test :syntax_error_on_parens_call do
     assert_compile_fail SyntaxError, "nofile:1: invalid comma inside parenthesis. If you are making a function call, " <>
-           "do not insert spaces in between the function name and the opening parentheses. " <>
-           "Syntax error before: )", 'foo (hello, world)'
+     "do not insert spaces in between the function name and the opening parentheses. " <>
+     "Syntax error before: )", 'foo (hello, world)'
   end
 
   test :syntax_error_with_no_token do
-    assert_compile_fail TokenMissingError, "nofile:1: missing terminator: ) (for \"(\" starting at line 1)", 'case 1 ('
+    assert_compile_fail TokenMissingError,
+      "nofile:1: missing terminator: ) (for \"(\" starting at line 1)",
+      'case 1 ('
+  end
+
+  test :clause_with_defaults do
+    assert_compile_fail CompileError,
+      "nofile:3: def hello/1 has default values and multiple clauses, " <>
+      "use a separate clause for declaring defaults",
+      '''
+      defmodule Sample do
+        def hello(arg // 0), do: nil
+        def hello(arg // 1), do: nil
+      end
+      '''
   end
 
   test :bad_form do
-    assert_compile_fail CompileError, "nofile:2: function bar/0 undefined", 'defmodule Foo do\ndef foo, do: bar\nend'
+    assert_compile_fail CompileError,
+      "nofile:2: function bar/0 undefined",
+      '''
+      defmodule Foo do
+        def foo, do: bar
+      end
+      '''
   end
 
   test :unbound_var do
-    assert_compile_fail SyntaxError, "nofile:1: unbound variable ^x", '^x = 1'
+    assert_compile_fail SyntaxError,
+      "nofile:1: unbound variable ^x",
+      '^x = 1'
   end
 
   test :unbound_not_match do
-    assert_compile_fail SyntaxError, "nofile:1: cannot use ^x outside of match clauses", '^x'
+    assert_compile_fail SyntaxError,
+      "nofile:1: cannot use ^x outside of match clauses",
+      '^x'
   end
 
   test :unbound_expr do
-    assert_compile_fail SyntaxError, "nofile:1: the unary operator ^ can only be used with variables, invalid expression ^x(1)", '^x(1)'
+    assert_compile_fail SyntaxError,
+      "nofile:1: the unary operator ^ can only be used with variables, invalid expression ^x(1)",
+      '^x(1)'
   end
 
   test :name_for_defmodule do
-    assert_compile_fail CompileError, "nofile:1: invalid module name: 3", 'defmodule 1 + 2, do: 3'
+    assert_compile_fail CompileError,
+      "nofile:1: invalid module name: 3",
+      'defmodule 1 + 2, do: 3'
   end
 
   test :invalid_scope_for_function do
-    assert_compile_fail SyntaxError, "nofile:1: cannot invoke def outside module", 'def Foo, do: 2'
-    assert_compile_fail SyntaxError, "nofile:3: cannot invoke defmacro outside module", '\n\ndefmacro Foo, do: 2'
+    assert_compile_fail SyntaxError,
+      "nofile:1: cannot invoke def outside module",
+      'def Foo, do: 2'
+    assert_compile_fail SyntaxError,
+      "nofile:3: cannot invoke defmacro outside module",
+      '\n\ndefmacro Foo, do: 2'
   end
 
   test :invalid_unquote do
-    assert_compile_fail SyntaxError, "nofile:1: unquote called outside quote", 'unquote 1'
+    assert_compile_fail SyntaxError,
+      "nofile:1: unquote called outside quote",
+      'unquote 1'
   end
 
   test :invalid_quote_args do
-    assert_compile_fail SyntaxError, "nofile:1: invalid args for quote", 'quote 1'
+    assert_compile_fail SyntaxError,
+      "nofile:1: invalid args for quote",
+      'quote 1'
   end
 
   test :invalid_parens do
-    assert_compile_fail SyntaxError, "nofile:1: unexpected parenthesis after foo(1)", 'foo(1)(2)'
+    assert_compile_fail SyntaxError,
+      "nofile:1: unexpected parenthesis after foo(1)",
+      'foo(1)(2)'
   end
 
   test :invalid_fn_args do
-    assert_compile_fail TokenMissingError, "nofile:1: missing terminator: end (for \"fn\" starting at line 1)", 'fn 1'
+    assert_compile_fail TokenMissingError,
+      "nofile:1: missing terminator: end (for \"fn\" starting at line 1)",
+      'fn 1'
   end
 
   test :macro_conflict do
-    assert_compile_fail CompileError, "nofile:1: imported Kernel.defrecord/2 conflicts with local function",
-      'defmodule Foo do\ndefrecord(Kernel.ErrorsTest.MacroConflict, a: 1)\ndef defrecord(_, _), do: OMG\nend'
+    assert_compile_fail CompileError,
+      "nofile:1: imported Kernel.defrecord/2 conflicts with local function",
+      '''
+      defmodule Foo do
+        defrecord(Kernel.ErrorsTest.MacroConflict, a: 1)
+        def defrecord(_, _), do: OMG
+      end
+      '''
   end
 
   test :macro_with_undefined_local do
-    assert_compile_fail UndefinedFunctionError, "undefined function: Foo.unknown/1",
-      'defmodule Foo do\ndefmacrop bar, do: unknown(1)\ndef baz, do: bar()\nend'
+    assert_compile_fail UndefinedFunctionError,
+      "undefined function: Foo.unknown/1",
+      '''
+      defmodule Foo do
+        defmacrop bar, do: unknown(1)
+        def baz, do: bar()
+      end
+      '''
   end
 
   test :private_macro do
-    assert_compile_fail UndefinedFunctionError, "undefined function: Foo.foo/0",
-      'defmodule Foo do\ndefmacrop foo, do: 1\ndefmacro bar, do: __MODULE__.foo\ndefmacro baz, do: bar\nend'
+    assert_compile_fail UndefinedFunctionError,
+      "undefined function: Foo.foo/0",
+      '''
+      defmodule Foo do
+        defmacrop foo, do: 1
+        defmacro bar, do: __MODULE__.foo
+        defmacro baz, do: bar
+      end
+      '''
   end
 
   test :function_definition_with_alias do
-    assert_compile_fail SyntaxError, "nofile:1: function names should start with lowercase characters or underscore, invalid name Bar",
-      'defmodule Foo do def Bar do :baz end\nend\n'
+    assert_compile_fail SyntaxError,
+      "nofile:2: function names should start with lowercase characters or underscore, invalid name Bar",
+      '''
+      defmodule Foo do
+        def Bar do
+          :baz
+        end
+      end
+      '''
   end
 
   test :function_import_conflict do
-    assert_compile_fail CompileError, "nofile:2: function exit/1 imported from both :erlang and Kernel, call is ambiguous",
-      'defmodule Foo do import :erlang\n def foo, do: exit(:test)\nend'
+    assert_compile_fail CompileError,
+      "nofile:3: function exit/1 imported from both :erlang and Kernel, call is ambiguous",
+      '''
+      defmodule Foo do
+        import :erlang
+        def foo, do: exit(:test)
+      end
+      '''
   end
 
   test :import_invalid_macro do
-    assert_compile_fail CompileError, "nofile:2: cannot import Kernel.invalid/1 because it doesn't exist",
-      'defmodule Foo do\nimport Kernel, only: [invalid: 1]\nend'
+    assert_compile_fail CompileError,
+      "nofile:1: cannot import Kernel.invalid/1 because it doesn't exist",
+      'import Kernel, only: [invalid: 1]'
   end
 
   test :unrequired_macro do
-    assert_compile_fail CompileError, "nofile:2: tried to invoke macro Kernel.ErrorsTest.UnproperMacro.unproper/1 but module was not required. Required: Kernel, Kernel.Typespec, Record",
-      'defmodule Foo do\nKernel.ErrorsTest.UnproperMacro.unproper([])\nend'
+    assert_compile_fail CompileError,
+      "nofile:2: tried to invoke macro Kernel.ErrorsTest.UnproperMacro.unproper/1 " <>
+      "but module was not required. Required: Kernel, Kernel.Typespec, Record",
+      '''
+      defmodule Foo do
+        Kernel.ErrorsTest.UnproperMacro.unproper([])
+      end
+      '''
   end
 
   test :def_defmacro_clause_change do
-    assert_compile_fail CompileError, "nofile:3: defmacro foo/1 already defined as def",
-      'defmodule Foo do\ndef foo(1), do: 1\ndefmacro foo(x), do: x\nend'
+    assert_compile_fail CompileError,
+      "nofile:3: defmacro foo/1 already defined as def",
+      '''
+      defmodule Foo do
+        def foo(1), do: 1
+        defmacro foo(x), do: x
+      end
+      '''
   end
 
   test :internal_function_overridden do
-    assert_compile_fail CompileError, "nofile:1: function __info__/1 is internal and should not be overridden",
-      'defmodule Foo do\ndef __info__(_), do: []\nend'
+    assert_compile_fail CompileError,
+      "nofile:1: function __info__/1 is internal and should not be overridden",
+      '''
+      defmodule Foo do
+        def __info__(_), do: []
+      end
+      '''
   end
 
   test :no_macros do
-    assert_compile_fail CompileError, "nofile:2: could not load macros from module :lists",
-      'defmodule Foo do\nimport :macros, :lists\nend'
+    assert_compile_fail CompileError,
+      "nofile:2: could not load macros from module :lists",
+      '''
+      defmodule Foo do
+        import :macros, :lists
+      end
+      '''
   end
 
   test :unloaded_module do
-    assert_compile_fail CompileError, "nofile:1: module Certainly.Doesnt.Exist is not loaded and could not be found",
+    assert_compile_fail CompileError,
+      "nofile:1: module Certainly.Doesnt.Exist is not loaded and could not be found",
       'import Certainly.Doesnt.Exist'
   end
 
   test :scheduled_module do
-    assert_compile_fail CompileError, "nofile:1: module Foo.Hygiene is not loaded but was defined. This happens because you are trying to use a module in the same context it is defined. Try defining the module outside the context that requires it.",
-      'defmodule Foo do; defmodule Hygiene do; end; import Foo.Hygiene; end'
+    assert_compile_fail CompileError,
+      "nofile:4: module Foo.Hygiene is not loaded but was defined. " <>
+      "This happens because you are trying to use a module in the same context it is defined. " <>
+      "Try defining the module outside the context that requires it.",
+      '''
+      defmodule Foo do
+        defmodule Hygiene do
+        end
+        import Foo.Hygiene
+      end
+      '''
   end
 
   test :already_compiled_module do
-    assert_compile_fail ArgumentError, "could not call eval_quoted on module Record because it was already compiled",
+    assert_compile_fail ArgumentError,
+      "could not call eval_quoted on module Record " <>
+      "because it was already compiled",
       'Module.eval_quoted Record, quote(do: 1), [], file: __FILE__'
   end
 
   test :interpolation_error do
-    assert_compile_fail TokenMissingError, "nofile:1: missing terminator: end (for \"do\" starting at line 1)", '"foo\#{case 1 do )}bar"'
+    assert_compile_fail TokenMissingError,
+      "nofile:1: missing terminator: end (for \"do\" starting at line 1)",
+      '"foo\#{case 1 do )}bar"'
   end
 
   test :cant_define_local_due_to_in_erlang_macros_conflict do
-    assert_compile_fail CompileError, "nofile:1: cannot define local quote/1 because it conflicts with Elixir special forms",
-      'defmodule Foo do\ndef quote(x), do: x\ndef bar(x), do: quote(do: x)\nend'
+    assert_compile_fail CompileError,
+      "nofile:1: cannot define local quote/1 because it conflicts with Elixir special forms",
+      '''
+      defmodule Foo do
+        def quote(x), do: x
+        def bar(x), do: quote(do: x)
+      end
+      '''
   end
 
   test :in_definition_module do
-    assert_compile_fail CompileError, "nofile:1: cannot define module Foo because it is currently being defined",
+    assert_compile_fail CompileError,
+      "nofile:1: cannot define module Foo because it is currently being defined",
       'defmodule Foo, do: (defmodule Elixir.Foo, do: true)'
   end
 
   test :invalid_definition do
-    assert_compile_fail SyntaxError, "nofile:1: invalid syntax in def 1.(hello)",
+    assert_compile_fail SyntaxError,
+      "nofile:1: invalid syntax in def 1.(hello)",
       'defmodule Foo, do: (def 1.(hello), do: true)'
   end
 
   test :duplicated_bitstring_size do
-    assert_compile_fail SyntaxError, "nofile:1: duplicated size definition for bitstring", '<<1 :: [size(12), size(13)]>>'
+    assert_compile_fail SyntaxError,
+      "nofile:1: duplicated size definition for bitstring",
+      '<<1 :: [size(12), size(13)]>>'
   end
 
   test :invalid_bitstring_specified do
-    assert_compile_fail SyntaxError, "nofile:1: unknown bitstring specifier :atom", '<<1 :: :atom>>'
-    assert_compile_fail SyntaxError, "nofile:1: unknown bitstring specifier unknown", '<<1 :: unknown>>'
-    assert_compile_fail SyntaxError, "nofile:1: unknown bitstring specifier another(12)", '<<1 :: another(12)>>'
-    assert_compile_fail SyntaxError, "nofile:1: size in bitstring expects an integer or a variable as argument", '<<1 :: size(:a)>>'
-    assert_compile_fail SyntaxError, "nofile:1: unit in bitstring expects an integer as argument", '<<1 :: unit(x)>>'
+    assert_compile_fail SyntaxError,
+      "nofile:1: unknown bitstring specifier :atom",
+      '<<1 :: :atom>>'
+
+    assert_compile_fail SyntaxError,
+      "nofile:1: unknown bitstring specifier unknown",
+      '<<1 :: unknown>>'
+
+    assert_compile_fail SyntaxError,
+      "nofile:1: unknown bitstring specifier another(12)",
+      '<<1 :: another(12)>>'
+
+    assert_compile_fail SyntaxError,
+      "nofile:1: size in bitstring expects an integer or a variable as argument",
+      '<<1 :: size(:a)>>'
+
+    assert_compile_fail SyntaxError,
+      "nofile:1: unit in bitstring expects an integer as argument",
+      '<<1 :: unit(x)>>'
   end
 
   test :invalid_var! do
-    assert_compile_fail SyntaxError, "nofile:1: expected var!(x) to expand to an existing variable or be a part of a match", 'var!(x)'
+    assert_compile_fail SyntaxError,
+      "nofile:1: expected var!(x) to expand to an existing variable or be a part of a match",
+      'var!(x)'
   end
 
   test :invalid_alias do
-    assert_compile_fail SyntaxError, "nofile:1: invalid args for alias, cannot create nested alias Sample.Lists",
+    assert_compile_fail SyntaxError,
+      "nofile:1: invalid args for alias, cannot create nested alias Sample.Lists",
       'alias :lists, as: Sample.Lists'
   end
 
   test :invalid_import_option do
-    assert_compile_fail SyntaxError, "nofile:1: unsupported option ops given to import",
+    assert_compile_fail SyntaxError,
+      "nofile:1: unsupported option ops given to import",
       'import :lists, [ops: 1]'
   end
 
+  test :invalid_access_protocol_not_available do
+    assert_compile_fail CompileError,
+      "nofile:2: module Unknown is not loaded and could not be found",
+      '''
+      defmodule Foo do
+        def sample(Unknown[integer: 0]), do: true
+      end
+      '''
+  end
+
   test :invalid_access_protocol_not_alias do
-    assert_raise RuntimeError, "the access protocol cannot be used inside match clauses (for example, on the left hand side of a match or in function signatures)", fn ->
+    assert_raise ArgumentError, "the access protocol cannot be used inside match clauses (for example, on the left hand side of a match or in function signatures)", fn ->
       defmodule Foo do
         def sample(config[integer: 0]), do: true
       end
     end
   end
 
-  test :invalid_access_protocol_not_available do
-    assert_compile_fail CompileError, "nofile:2: module Unknown is not loaded and could not be found",
-      'defmodule Foo do\ndef sample(Unknown[integer: 0]), do: true\nend'
-  end
-
   test :invalid_access_protocol_not_record do
-    assert_raise RuntimeError, "cannot use module Kernel.ErrorsTest in access protocol because it does not export __record__/1", fn ->
+    assert_raise ArgumentError, "cannot use module Kernel.ErrorsTest in access protocol because it does not export __record__/1", fn ->
       defmodule Foo do
         def sample(Kernel.ErrorsTest[integer: 0]), do: true
       end
@@ -227,7 +388,7 @@ defmodule Kernel.ErrorsTest do
   end
 
   test :invalid_access_protocol_not_keywords do
-    assert_raise RuntimeError, "expected contents inside brackets to be a Keyword", fn ->
+    assert_raise ArgumentError, "expected contents inside brackets to be a Keyword", fn ->
       defmodule Foo do
         def sample(Kernel.ErrorsTest.Config[0]), do: true
       end
@@ -235,7 +396,7 @@ defmodule Kernel.ErrorsTest do
   end
 
   test :invalid_access_protocol_invalid_keywords do
-    assert_raise RuntimeError, "record Kernel.ErrorsTest.Config does not have the keys: [:foo]", fn ->
+    assert_raise ArgumentError, "record Kernel.ErrorsTest.Config does not have the keys: [:foo]", fn ->
       defmodule Foo do
         def sample(Kernel.ErrorsTest.Config[foo: :bar]), do: true
       end
@@ -243,68 +404,83 @@ defmodule Kernel.ErrorsTest do
   end
 
   test :invalid_access_protocol_invalid_keywords_outside_match do
-    # FIXME: why RuntimeError?
-    assert_compile_fail RuntimeError, "record Kernel.ErrorsTest.Config does not have the keys: [:foo]",
+    assert_compile_fail ArgumentError,
+      "record Kernel.ErrorsTest.Config does not have the keys: [:foo]",
       'Kernel.ErrorsTest.Config[foo: :bar]'
   end
 
   test :invalid_rescue_clause do
-    assert_compile_fail SyntaxError, "nofile:4: invalid rescue clause. The clause should match on an alias, a variable or be in the `var in [alias]` format",
+    assert_compile_fail SyntaxError,
+      "nofile:4: invalid rescue clause. The clause should match on an alias, a variable or be in the `var in [alias]` format",
       'try do\n1\nrescue\nUndefinedFunctionError[arity: 1] -> false\nend'
   end
 
   test :invalid_bc_return do
-    assert_compile_fail SyntaxError, "nofile:1: a bit comprehension expects a bit string << >> to be returned",
+    assert_compile_fail SyntaxError,
+      "nofile:1: a bit comprehension expects a bit string << >> to be returned",
       'bc x inlist [1, 2, 3], do: x'
   end
 
   test :invalid_bc_inbits_gen do
-    assert_compile_fail SyntaxError, "nofile:1: a bit comprehension expects a bit string << >> to be used in inbits generators",
+    assert_compile_fail SyntaxError,
+      "nofile:1: a bit comprehension expects a bit string << >> to be used in inbits generators",
       'bc x inbits "123", do: <<x>>'
   end
 
   test :unbound_cond do
-    assert_compile_fail ArgumentError, "unbound variable _ inside cond. If you want the last clause to match, you probably meant to use true ->",
+    assert_compile_fail ArgumentError,
+      "unbound variable _ inside cond. If you want the last clause to match, you probably meant to use true ->",
       'cond do _ -> true end'
   end
 
   test :fun_different_arities do
-    assert_compile_fail SyntaxError, "nofile:1: cannot mix clauses with different arities in function definition",
+    assert_compile_fail SyntaxError,
+      "nofile:1: cannot mix clauses with different arities in function definition",
       'fn x -> x; x, y -> x + y end'
   end
 
   test :new_line_error do
-    assert_compile_fail SyntaxError, "nofile:3: syntax error before: newline",
+    assert_compile_fail SyntaxError,
+      "nofile:3: syntax error before: newline",
       'if true do\n  foo = [],\n  baz\nend'
   end
 
   test :invalid_var_or_function_on_guard do
-    assert_compile_fail SyntaxError, "nofile:1: unknown variable something_that_does_not_exist or cannot invoke function something_that_does_not_exist/0 inside guard",
-      ('case [] do; [] when something_that_does_not_exist == [] -> :ok; end')
-  end
-
-  test :bodyless_function do
-    assert {{:module, M, _, {:foo, 1}}, [], _} =
-      :elixir.eval(to_char_list("defmodule M do\ndef foo(n)\nend"), [])
+    assert_compile_fail SyntaxError,
+      "nofile:2: unknown variable something_that_does_not_exist or " <>
+      "cannot invoke function something_that_does_not_exist/0 inside guard",
+      '''
+      case [] do
+        [] when something_that_does_not_exist == [] -> :ok
+      end
+      '''
   end
 
   test :bodyless_function_with_guard do
-    assert_compile_fail SyntaxError, "nofile:2: missing keyword do in def",
-      ("defmodule Foo do\ndef foo(n) when is_number(n)\nend")
+    assert_compile_fail SyntaxError,
+      "nofile:2: missing keyword do in def",
+      '''
+      defmodule Foo do
+        def foo(n) when is_number(n)
+      end
+      '''
   end
 
   test :invalid_function_on_match do
-    assert_compile_fail SyntaxError, "nofile:1: cannot invoke function something_that_does_not_exist/0 inside match",
-      ('case [] do; something_that_does_not_exist() -> :ok; end')
+    assert_compile_fail SyntaxError,
+      "nofile:1: cannot invoke function something_that_does_not_exist/0 inside match",
+      'case [] do; something_that_does_not_exist() -> :ok; end'
   end
 
   test :invalid_remote_on_match do
-    assert_compile_fail SyntaxError, "nofile:1: cannot invoke remote function Hello.something_that_does_not_exist/0 inside match",
-      ('case [] do; Hello.something_that_does_not_exist() -> :ok; end')
+    assert_compile_fail SyntaxError,
+      "nofile:1: cannot invoke remote function Hello.something_that_does_not_exist/0 inside match",
+      'case [] do; Hello.something_that_does_not_exist() -> :ok; end'
   end
 
   test :invalid_remote_on_guard do
-    assert_compile_fail SyntaxError, "nofile:1: cannot invoke remote function Hello.something_that_does_not_exist/0 inside guard",
+    assert_compile_fail SyntaxError,
+      "nofile:1: cannot invoke remote function Hello.something_that_does_not_exist/0 inside guard",
       ('case [] do; [] when Hello.something_that_does_not_exist == [] -> :ok; end')
   end
 
diff --git a/lib/elixir/test/elixir/kernel/warning_test.exs b/lib/elixir/test/elixir/kernel/warning_test.exs
index c32bf66ca8..3ba722fd4b 100644
--- a/lib/elixir/test/elixir/kernel/warning_test.exs
+++ b/lib/elixir/test/elixir/kernel/warning_test.exs
@@ -228,19 +228,6 @@ defmodule Kernel.WarningTest do
     purge Sample
   end
 
-  test :multiple_clauses_with_defaults do
-    assert capture_err(fn ->
-      Code.eval_string """
-      defmodule Sample do
-        def hello(arg // 0), do: nil
-        def hello(arg // 1), do: nil
-      end
-      """
-    end) =~ "def hello/1 has default values and multiple clauses, use a separate clause for declaring defaults"
-  after
-    purge Sample
-  end
-
   test :unused_with_local_with_overridable do
     assert capture_err(fn ->
       Code.eval_string """
diff --git a/lib/elixir/test/elixir/kernel_test.exs b/lib/elixir/test/elixir/kernel_test.exs
index 16f8c0e78f..577254e70c 100644
--- a/lib/elixir/test/elixir/kernel_test.exs
+++ b/lib/elixir/test/elixir/kernel_test.exs
@@ -312,8 +312,6 @@ defmodule KernelTest do
 
       import CompileAssertion
 
-      # FIXME: this mustn't work, but it doesn't call pipeline_op at all
-      #assert_compile_fail ArgumentError, "Unsupported expression in pipeline |> operator: &1", "1 |> &1"
       assert_compile_fail ArgumentError, "Unsupported expression in pipeline |> operator: &1 * 2", "1 |> &1*2"
       assert_compile_fail ArgumentError, "Unsupported expression in pipeline |> operator: hd(&1)", "[1] |> hd(&1)"
     end
diff --git a/lib/iex/test/iex/helpers_test.exs b/lib/iex/test/iex/helpers_test.exs
index 365aa31c77..5673fe0ea7 100644
--- a/lib/iex/test/iex/helpers_test.exs
+++ b/lib/iex/test/iex/helpers_test.exs
@@ -246,7 +246,6 @@ defmodule IEx.HelpersTest do
       assert Sample.run == :run
 
       File.write! filename, "defmodule Sample do end"
-      # FIXME: this could probably be improved
       System.cmd "../../bin/elixirc sample.ex"
 
       assert l(Sample) == {:module, Sample}