Eliminate doc and suite clauses

14 files changed, 64 insertions, 210 deletions

diff --git a/lib/debugger/test/bs_construct_SUITE.erl b/lib/debugger/test/bs_construct_SUITE.erl
index 330afbe00a..132aaa95eb 100644
--- a/lib/debugger/test/bs_construct_SUITE.erl
+++ b/lib/debugger/test/bs_construct_SUITE.erl
@@ -278,7 +278,6 @@ fail_check(Res, _, _) ->
     ct:fail(did_not_fail_in_compiled_code).
 
 %%% Simple working cases
-test1(suite) -> [];
 test1(Config) when is_list(Config) ->
     ?line I_13 = i(13),
     ?line I_big1 = big(1),
@@ -300,7 +299,6 @@ gen(N, S, A) ->
 gen_l(N, S, A) ->
     [?T(<<A:S/little, A:(N-S)/little>>, comp(N, A, S))].
 
-test2(suite) -> [];
 test2(Config) when is_list(Config) ->
     ?line test2(0, 8, 2#10101010101010101),
     ?line test2(0, 8, 2#1111111111).
@@ -328,7 +326,6 @@ t3() ->
      ?N(<<>>)
     ].
 
-test3(suite) -> [];
 test3(Config) when is_list(Config) ->
     ?line Vars = [],
     ?line lists:foreach(fun one_test/1, eval_list(t3(), Vars)).
@@ -339,7 +336,6 @@ gen_u(N, S, A) ->
 gen_u_l(N, S, A) ->
     [?N(<<A:S/little, A:(N-S)/little>>)].
 
-test4(suite) -> [];
 test4(Config) when is_list(Config) ->
     ?line test4(0, 16, 2#10101010101010101),
     ?line test4(0, 16, 2#1111111111).
@@ -360,8 +356,7 @@ gen_b(N, S, A) ->
     [?T(<<A:S/binary-unit:1, A:(N-S)/binary-unit:1>>,
 	binary_to_list(<<A:S/binary-unit:1, A:(N-S)/binary-unit:1>>))].
 
-test5(suite) -> [];
-test5(doc) -> ["OTP-3995"];
+%% OTP-3995.
 test5(Config) when is_list(Config) ->
     ?line test5(0, 8, <<73>>),
     ?line test5(0, 8, <<68>>).
@@ -378,7 +373,6 @@ test5(S, A) ->
     lists:foreach(fun one_test/1, eval_list(gen_b(N, S, A), Vars)).
 
 %%% Failure cases
-testf(suite) -> [];
 testf(Config) when is_list(Config) ->
     ?line ?FAIL(<<3.14>>),
     ?line ?FAIL(<<<<1,2>>>>),
@@ -428,8 +422,7 @@ testf_1(W, B) ->
     ?FAIL_VARS(<<3.14:W/float>>, Vars),
     ?FAIL_VARS(<<B:W/binary>>, [{'B',B}|Vars]).
 
-not_used(doc) ->
-    "Test that constructed binaries that are not used will still give an exception.";
+%% Test that constructed binaries that are not used will still give an exception.
 not_used(Config) when is_list(Config) ->
     ?line ok = not_used1(3, <<"dum">>),
     ?line {'EXIT',{badarg,_}} = (catch not_used1(3, "dum")),
@@ -469,7 +462,7 @@ in_guard(Bin, A, B) when <<A:14,B/float,3:2>> == Bin -> 3;
 in_guard(Bin, A, B) when {a,b,<<A:14,B/float,3:2>>} == Bin -> cant_happen;
 in_guard(_, _, _) -> nope.
 
-mem_leak(doc) -> "Make sure that construction has no memory leak";
+%% Make sure that construction has no memory leak.
 mem_leak(Config) when is_list(Config) ->
     ?line B = make_bin(16, <<0>>),
     ?line mem_leak(1024, B),
diff --git a/lib/debugger/test/bs_match_bin_SUITE.erl b/lib/debugger/test/bs_match_bin_SUITE.erl
index e9ba2453d5..eb4410762e 100644
--- a/lib/debugger/test/bs_match_bin_SUITE.erl
+++ b/lib/debugger/test/bs_match_bin_SUITE.erl
@@ -60,7 +60,7 @@ init_per_suite(Config) when is_list(Config) ->
 end_per_suite(Config) when is_list(Config) ->
     ok.
 
-byte_split_binary(doc) -> "Tries to split a binary at all byte-aligned positions.";
+%% Tries to split a binary at all byte-aligned positions.
 byte_split_binary(Config) when is_list(Config) ->
     ?line L = lists:seq(0, 57),
     ?line B = mkbin(L),
@@ -77,7 +77,7 @@ byte_split(L, B, Pos) when Pos >= 0 ->
     ?line byte_split(L, B, Pos-1);
 byte_split(_, _, _) -> ok.
 
-bit_split_binary(doc) -> "Tries to split a binary at all positions.";
+%% Tries to split a binary at all positions.
 bit_split_binary(Config) when is_list(Config) ->
     Fun = fun(Bin, List, SkipBef, N) ->
 		  ?line SkipAft = 8*size(Bin) - N - SkipBef,
diff --git a/lib/debugger/test/bs_match_int_SUITE.erl b/lib/debugger/test/bs_match_int_SUITE.erl
index 81460361b1..c2d50a29e6 100644
--- a/lib/debugger/test/bs_match_int_SUITE.erl
+++ b/lib/debugger/test/bs_match_int_SUITE.erl
@@ -142,7 +142,7 @@ dynamic(Bin, S1, S2, A, B) ->
 	_Other -> erlang:error(badmatch, [Bin,S1,S2,A,B])
     end.
 
-more_dynamic(doc) -> "Extract integers at different alignments and of different sizes.";
+%% Extract integers at different alignments and of different sizes.
 more_dynamic(Config) when is_list(Config) ->
 
     % Unsigned big-endian numbers.
diff --git a/lib/debugger/test/bs_match_misc_SUITE.erl b/lib/debugger/test/bs_match_misc_SUITE.erl
index c375d267e3..f184e8fc41 100644
--- a/lib/debugger/test/bs_match_misc_SUITE.erl
+++ b/lib/debugger/test/bs_match_misc_SUITE.erl
@@ -65,7 +65,7 @@ init_per_testcase(_Case, Config) ->
 end_per_testcase(_Case, _Config) ->
     ok.
 
-bound_var(doc) -> "Test matching of bound variables.";
+%% Test matching of bound variables.
 bound_var(Config) when is_list(Config) ->
     ?line ok = bound_var(42, 13, <<42,13>>),
     ?line nope = bound_var(42, 13, <<42,255>>),
@@ -75,7 +75,7 @@ bound_var(Config) when is_list(Config) ->
 bound_var(A, B, <<A:8,B:8>>) -> ok;
 bound_var(_, _, _) -> nope.
 
-bound_tail(doc) -> "Test matching of a bound tail.";
+%% Test matching of a bound tail.
 bound_tail(Config) when is_list(Config) ->
     ?line ok = bound_tail(<<>>, <<13,14>>),
     ?line ok = bound_tail(<<2,3>>, <<1,1,2,3>>),
diff --git a/lib/debugger/test/bs_match_tail_SUITE.erl b/lib/debugger/test/bs_match_tail_SUITE.erl
index bc4446dd02..3586988ca6 100644
--- a/lib/debugger/test/bs_match_tail_SUITE.erl
+++ b/lib/debugger/test/bs_match_tail_SUITE.erl
@@ -63,7 +63,7 @@ init_per_suite(Config) when is_list(Config) ->
 end_per_suite(Config) when is_list(Config) ->
     ok.
 
-aligned(doc) -> "Test aligned tails.";
+%% Test aligned tails.
 aligned(Config) when is_list(Config) ->
     ?line Tail1 = mkbin([]),
     ?line {258,Tail1} = al_get_tail_used(mkbin([1,2])),
@@ -86,7 +86,7 @@ aligned(Config) when is_list(Config) ->
 al_get_tail_used(<<A:16,T/binary>>) -> {A,T}.
 al_get_tail_unused(<<A:16,_/binary>>) -> A.
 
-unaligned(doc) -> "Test that an non-aligned tail cannot be matched out.";
+%% Test that an non-aligned tail cannot be matched out.
 unaligned(Config) when is_list(Config) ->
     ?line {'EXIT',{function_clause,_}} = (catch get_tail_used(mkbin([42]))),
     ?line {'EXIT',{{badmatch,_},_}} = (catch get_dyn_tail_used(mkbin([137]), 3)),
@@ -106,7 +106,7 @@ get_dyn_tail_unused(Bin, Sz) ->
     <<A:Sz,_/binary>> = Bin,
     A.
 
-zero_tail(doc) -> "Test that zero tails are tested correctly.";
+%% Test that zero tails are tested correctly.
 zero_tail(Config) when is_list(Config) ->
     ?line 7 = (catch test_zero_tail(mkbin([7]))),
     ?line {'EXIT',{function_clause,_}} = (catch test_zero_tail(mkbin([1,2]))),
diff --git a/lib/debugger/test/bug_SUITE.erl b/lib/debugger/test/bug_SUITE.erl
index 48cdcea576..1f2778a928 100644
--- a/lib/debugger/test/bug_SUITE.erl
+++ b/lib/debugger/test/bug_SUITE.erl
@@ -52,8 +52,7 @@ end_per_group(_GroupName, Config) ->
 
 
 
-otp2163(doc) -> ["BIF exit reason"];
-otp2163(suite) -> [];
+%% BIF exit reason.
 otp2163(Config) when is_list(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
 
@@ -75,8 +74,7 @@ otp2163(Config) when is_list(Config) ->
     ok.
 
 
-otp4845(doc) -> ["BIF not loading and not bug compatible, OTP-4845 OTP-4859"];
-otp4845(suite) -> [];
+%% BIF not loading and not bug compatible, OTP-4845 OTP-4859.
 otp4845(Config) when is_list(Config) ->
     DataDir = proplists:get_value(data_dir, Config),
 
diff --git a/lib/debugger/test/cleanup.erl b/lib/debugger/test/cleanup.erl
index 8b41b45d59..29561480d1 100644
--- a/lib/debugger/test/cleanup.erl
+++ b/lib/debugger/test/cleanup.erl
@@ -38,7 +38,6 @@ end_per_group(_GroupName, Config) ->
 	Config.
 
 
-cleanup(suite) -> [];
 cleanup(_) ->
     ?line Mods = int:interpreted(),
     ?line ok = int:n(Mods),
diff --git a/lib/debugger/test/dbg_ui_SUITE.erl b/lib/debugger/test/dbg_ui_SUITE.erl
index 58a784a642..626e49f3ef 100644
--- a/lib/debugger/test/dbg_ui_SUITE.erl
+++ b/lib/debugger/test/dbg_ui_SUITE.erl
@@ -77,12 +77,7 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
-dbg_ui (doc) ->
-    ["Debugger GUI"];
-
-dbg_ui (suite) ->
-    [];
-
+%% Test Debugger GUI.
 dbg_ui (_Config) ->
     case os:getenv("DISPLAY") of
 	false ->
@@ -135,8 +130,6 @@ check(Case, Config) ->
 
 
 -define(MAN_CASE(Name,Doc, Description),
-	Name(doc) -> [Doc];
-	Name(suite) -> [];
 	Name(Config) ->
 	       ?line io:format("Checking ~p~n",[Name]),
 	       ?line io:format("Config = ~p~n",[Config]),
diff --git a/lib/debugger/test/erl_eval_SUITE.erl b/lib/debugger/test/erl_eval_SUITE.erl
index 0cc6a87972..3b262189ce 100644
--- a/lib/debugger/test/erl_eval_SUITE.erl
+++ b/lib/debugger/test/erl_eval_SUITE.erl
@@ -85,10 +85,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-guard_1(doc) ->
-    ["(OTP-2405)"];
-guard_1(suite) ->
-    [];
+%% (OTP-2405).
 guard_1(Config) when is_list(Config) ->
     ?line {ok,Tokens ,_} =
 	erl_scan:string("if a+4 == 4 -> yes; true -> no end. "),
@@ -100,10 +97,7 @@ guard_1(Config) when is_list(Config) ->
 guard_1_compiled() ->
     if a+4 == 4 -> yes; true -> no end.
 
-guard_2(doc) ->
-    ["Similar to guard_1, but type-correct"];
-guard_2(suite) ->
-    [];
+%% Similar to guard_1, but type-correct.
 guard_2(Config) when is_list(Config) ->
     ?line {ok,Tokens ,_} =
 	erl_scan:string("if 6+4 == 4 -> yes; true -> no end. "),
@@ -115,10 +109,7 @@ guard_2(Config) when is_list(Config) ->
 guard_2_compiled() ->
     if 6+4 == 4 -> yes; true -> no end.
 
-string_plusplus(doc) ->
-    ["OTP-3069: syntactic sugar string ++ ..."];
-string_plusplus(suite) ->
-    [];
+%% OTP-3069: syntactic sugar string ++ ...
 string_plusplus(Config) when is_list(Config) ->
     ?line check(fun() -> case "abc" of "ab" ++ L -> L end end,
 		"case \"abc\" of \"ab\" ++ L -> L end. ",
@@ -131,10 +122,7 @@ string_plusplus(Config) when is_list(Config) ->
 		"c"),
     ok.
 
-match_pattern(doc) ->
-    ["OTP-2983: match operator in pattern"];
-match_pattern(suite) ->
-    [];
+%% OTP-2983: match operator in pattern.
 match_pattern(Config) when is_list(Config) ->
     ?line check(fun() -> case {a, b} of {a, _X}=Y -> {x,Y} end end,
 		"case {a, b} of {a, X}=Y -> {x,Y} end. ",
@@ -150,10 +138,7 @@ match_pattern(Config) when is_list(Config) ->
                 28),
     ok.
 
-match_bin(doc) ->
-    ["binary match problems"];
-match_bin(suite) ->
-    [];
+%% binary match problems.
 match_bin(Config) when is_list(Config) ->
     ?line check(fun() -> <<"abc">> = <<"abc">> end,
 		"<<\"abc\">> = <<\"abc\">>. ",
@@ -167,10 +152,7 @@ match_bin(Config) when is_list(Config) ->
 		{2,<<"AB">>,<<"CD">>}),
     ok.
 
-pattern_expr(doc) ->
-    ["OTP-3144: compile-time expressions in pattern"];
-pattern_expr(suite) ->
-    [];
+%% OTP-3144: compile-time expressions in pattern.
 pattern_expr(Config) when is_list(Config) ->
     ?line check(fun() -> case 4 of 2+2 -> ok end end,
 		"case 4 of 2+2 -> ok end. ",
@@ -180,10 +162,7 @@ pattern_expr(Config) when is_list(Config) ->
 		ok),
     ok.
 
-guard_3(doc) ->
-    ["OTP-4518."];
-guard_3(suite) ->
-    [];
+%% OTP-4518.
 guard_3(Config) when is_list(Config) ->
     ?line check(fun() -> if false -> false; true -> true end end,
                 "if false -> false; true -> true end.",
@@ -200,10 +179,7 @@ guard_3(Config) when is_list(Config) ->
                 true),
     ok.
 
-guard_4(doc) ->
-    ["OTP-4885."];
-guard_4(suite) ->
-    [];
+%% OTP-4885.
 guard_4(Config) when is_list(Config) ->
     check(fun() -> if erlang:'+'(3,a) -> true ; true -> false end end,
 	  "if erlang:'+'(3,a) -> true ; true -> false end.",
@@ -234,10 +210,7 @@ guard_4(Config) when is_list(Config) ->
     ok.
 
 
-lc(doc) ->
-    ["OTP-4518."];
-lc(suite) ->
-    [];
+%% OTP-4518.
 lc(Config) when is_list(Config) ->
     ?line check(fun() -> X = 32, [X || X <- [1,2,3]] end,
                 "begin X = 32, [X || X <- [1,2,3]] end.",
@@ -265,10 +238,7 @@ lc(Config) when is_list(Config) ->
                 "[X || X <- [true,false], X].", [true]),
     ok.
 
-simple_cases(doc) ->
-    ["Simple cases, just to cover some code."];
-simple_cases(suite) ->
-    [];
+%% Simple cases, just to cover some code.
 simple_cases(Config) when is_list(Config) ->
     ?line check(fun() -> A = $C end, "A = $C.", $C),
     %% ?line check(fun() -> A = 3.14 end, "A = 3.14.", 3.14),
@@ -493,10 +463,7 @@ simple_cases(Config) when is_list(Config) ->
     ?line check(fun() -> (bnot 1) < -0 end, "(bnot (+1)) < -0.", true),
     ok.
 
-unary_plus(doc) ->
-    ["OTP-4929. Unary plus rejects non-numbers."];
-unary_plus(suite) ->
-    [];
+%% OTP-4929. Unary plus rejects non-numbers.
 unary_plus(Config) when is_list(Config) ->
     ?line check(fun() -> F = fun(X) -> + X end,
                          true = -1 == F(-1) end,
@@ -505,20 +472,14 @@ unary_plus(Config) when is_list(Config) ->
     ?line error_check("+a.", badarith),
     ok.
 
-apply_atom(doc) ->
-    ["OTP-5064. Can no longer apply atoms."];
-apply_atom(suite) ->
-    [];
+%% OTP-5064. Can no longer apply atoms.
 apply_atom(Config) when is_list(Config) ->
     ?line error_check("[X || X <- [[1],[2]],
                              begin L = length, L(X) =:= 1 end].",
                       {badfun,length}),
     ok.
 
-otp_5269(doc) ->
-    ["OTP-5269. Bugs in the bit syntax."];
-otp_5269(suite) ->
-    [];
+%% OTP-5269. Bugs in the bit syntax.
 otp_5269(Config) when is_list(Config) ->
     ?line check(fun() -> L = 8,
                          F = fun(<<A:L,B:A>>) -> B end,
@@ -562,10 +523,7 @@ otp_5269(Config) when is_list(Config) ->
                 [19]),
     ok.
 
-otp_6539(doc) ->
-    ["OTP-6539. try/catch bugs."];
-otp_6539(suite) ->
-    [];
+%% OTP-6539. try/catch bugs.
 otp_6539(Config) when is_list(Config) ->
     ?line check(fun() ->
                         F = fun(A,B) ->
@@ -586,10 +544,7 @@ otp_6539(Config) when is_list(Config) ->
                 [3, 5]),
     ok.
 
-otp_6543(doc) ->
-    ["OTP-6543. bitlevel binaries."];
-otp_6543(suite) ->
-    [];
+%% OTP-6543. bitlevel binaries.
 otp_6543(Config) when is_list(Config) ->
     ?line check(fun() ->
                         << <<X>> || <<X>> <- [1,2,3] >>
@@ -808,10 +763,7 @@ otp_6543(Config) when is_list(Config) ->
     ?line error_check("[X || <<X>> <= [a,b]].",{bad_generator,[a,b]}),
     ok.
 
-otp_6787(doc) ->
-    ["OTP-6787. bitlevel binaries."];
-otp_6787(suite) ->
-    [];
+%% OTP-6787. bitlevel binaries.
 otp_6787(Config) when is_list(Config) ->
     ?line check(
             fun() -> <<16:(1024*1024)>> = <<16:(1024*1024)>> end,
@@ -819,10 +771,7 @@ otp_6787(Config) when is_list(Config) ->
             <<16:1048576>>),
     ok.
 
-otp_6977(doc) ->
-    ["OTP-6977. ++ bug."];
-otp_6977(suite) ->
-    [];
+%% OTP-6977. ++ bug.
 otp_6977(Config) when is_list(Config) ->
     ?line check(
             fun() -> (fun([$X] ++ _) -> ok end)("X") end,
@@ -830,8 +779,7 @@ otp_6977(Config) when is_list(Config) ->
             ok),
     ok.
 
-otp_7550(doc) ->
-    ["OTP-7550. Support for UTF-8, UTF-16, UTF-32."];
+%% OTP-7550. Support for UTF-8, UTF-16, UTF-32.
 otp_7550(Config) when is_list(Config) ->
 
     %% UTF-8.
@@ -905,10 +853,7 @@ otp_7550(Config) when is_list(Config) ->
     ok.
 
 
-otp_8133(doc) ->
-    ["OTP-8133. Bit comprehension bug."];
-otp_8133(suite) ->
-    [];
+%% OTP-8133. Bit comprehension bug.
 otp_8133(Config) when is_list(Config) ->
     ?line check(
             fun() ->
@@ -958,10 +903,7 @@ otp_8133(Config) when is_list(Config) ->
             ok),
     ok.
 
-funs(doc) ->
-    ["Simple cases, just to cover some code."];
-funs(suite) ->
-    [];
+%% Simple cases, just to cover some code.
 funs(Config) when is_list(Config) ->
     do_funs(none, none),
     do_funs(lfh(), none),
@@ -1181,10 +1123,7 @@ external_func({M,F}, As) ->
 
 
 
-try_catch(doc) ->
-    ["Test try-of-catch-after-end statement"];
-try_catch(suite) ->
-    [];
+%% Test try-of-catch-after-end statement.
 try_catch(Config) when is_list(Config) ->
     %% Match in of with catch
     ?line check(fun() -> try 1 of 1 -> 2 catch _:_ -> 3 end end,
@@ -1294,10 +1233,7 @@ try_catch(Config) when is_list(Config) ->
     ok.
 
 
-eval_expr_5(doc) ->
-    ["(OTP-7933)"];
-eval_expr_5(suite) ->
-    [];
+%% (OTP-7933).
 eval_expr_5(Config) when is_list(Config) ->
     ?line {ok,Tokens ,_} =
 	erl_scan:string("if a+4 == 4 -> yes; true -> no end. "),
diff --git a/lib/debugger/test/fun_SUITE.erl b/lib/debugger/test/fun_SUITE.erl
index 4beedc550c..94c67dcc3e 100644
--- a/lib/debugger/test/fun_SUITE.erl
+++ b/lib/debugger/test/fun_SUITE.erl
@@ -75,9 +75,7 @@ good_call(Config) when is_list(Config) ->
     ?line ok = FF(),
     ok.
 
-bad_apply(doc) ->
-    "Test that the correct EXIT code is returned for all types of bad funs.";
-bad_apply(suite) -> [];
+%% Test that the correct EXIT code is returned for all types of bad funs.
 bad_apply(Config) when is_list(Config) ->
     ?line bad_apply_fc(42, [0]),
     ?line bad_apply_fc(xx, [1]),
@@ -115,9 +113,7 @@ bad_apply_badarg(Fun, Args) ->
 	    ct:fail({bad_result, Other})
     end.
 
-bad_fun_call(doc) ->
-    "Try directly calling bad funs.";
-bad_fun_call(suite) -> [];
+%% Try directly calling bad funs.
 bad_fun_call(Config) when is_list(Config) ->
     ?line bad_call_fc(42),
     ?line bad_call_fc(xx),
@@ -213,10 +209,7 @@ ext_badarity(Config) when is_list(Config) ->
 nothing() ->
     ok.
 
-otp_6061(suite) ->
-    [];
-otp_6061(doc) ->
-    ["Test handling of fun expression referring to uninterpreted code"];
+%% Test handling of fun expression referring to uninterpreted code.
 otp_6061(Config) when is_list(Config) ->
 
     ?line OrigFlag = process_flag(trap_exit, true),
diff --git a/lib/debugger/test/guard_SUITE.erl b/lib/debugger/test/guard_SUITE.erl
index 81b72db9f5..c6cb4a82d2 100644
--- a/lib/debugger/test/guard_SUITE.erl
+++ b/lib/debugger/test/guard_SUITE.erl
@@ -87,8 +87,7 @@ init_per_suite(Config) when is_list(Config) ->
 end_per_suite(Config) when is_list(Config) ->
     ok.
 
-bad_arith(doc) -> "Test that a bad arithmetic operation in a guard works correctly.";
-bad_arith(suite) -> [];
+%% Test that a bad arithmetic operation in a guard works correctly.
 bad_arith(Config) when list(Config) ->
     ?line 5 = bad_arith1(2, 3),
     ?line 10 = bad_arith1(1, infinity),
@@ -108,8 +107,7 @@ bad_div(A, B) when A div B > 0 ->
 bad_div(_A, _B) ->
     42.
 
-bad_tuple(doc) -> "Test that bad arguments to element/2 are handled correctly.";
-bad_tuple(suite) -> [];
+%% Test that bad arguments to element/2 are handled correctly.
 bad_tuple(Config) when list(Config) ->
     ?line error = bad_tuple1(a),
     ?line error = bad_tuple1({a, b}),
@@ -121,8 +119,7 @@ bad_tuple1(T) when element(1, T) == x -> x;
 bad_tuple1(T) when element(3, T) == y -> y;
 bad_tuple1(_) -> error.
 
-test_heap_guards(doc) -> "";
-test_heap_guards(suite) -> [];
+%% .
 test_heap_guards(Config) when list(Config) ->
     ?line process_flag(trap_exit, true),
     ?line Tuple = {a, tuple, is, built, here, xxx},
@@ -201,8 +198,7 @@ init(_ReplyTo, Fun, Args, Filler) ->
 dummy(_) ->
     ok.
 
-guard_bifs(doc) -> "Test all guard bifs with nasty (but legal arguments).";
-guard_bifs(suite) -> [];
+%% Test all guard bifs with nasty (but legal arguments).
 guard_bifs(Config) when list(Config) ->
     ?line Big = -237849247829874297658726487367328971246284736473821617265433,
     ?line Float = 387924.874,
@@ -329,8 +325,7 @@ guard_bif('node/0', X, Y) when node() == Y ->
 guard_bif('node/1', X, Y) when node(X) == Y ->
     {'node/1', X, Y}.
 
-type_tests(doc) -> "Test the type tests.";
-type_tests(suite) -> [];
+%% Test the type tests.
 type_tests(Config) when list(Config) ->
     ?line Types = all_types(),
     ?line Tests = type_test_desc(),
@@ -1527,8 +1522,7 @@ mask_error({'EXIT',{Err,_}}) ->
 mask_error(Else) ->
     Else.
 
-binary_part(doc) ->
-    ["Tests the binary_part/2,3 guard (GC) bif's"];
+%% Tests the binary_part/2,3 guard (GC) bif's.
 binary_part(Config) when is_list(Config) ->
     %% This is more or less a copy of what the guard_SUITE in emulator
     %% does to cover the guard bif's
diff --git a/lib/debugger/test/int_SUITE.erl b/lib/debugger/test/int_SUITE.erl
index 4aae08810b..01bdc16b0a 100644
--- a/lib/debugger/test/int_SUITE.erl
+++ b/lib/debugger/test/int_SUITE.erl
@@ -84,10 +84,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-interpret(suite) ->
-    [];
-interpret(doc) ->
-    ["Interpreting modules"];
+%% Interpreting modules.
 interpret(Config) when is_list(Config) ->
     ?line int:n(int:interpreted()),
 
@@ -111,20 +108,10 @@ interpret(Config) when is_list(Config) ->
 
     ok.
 
-guards(suite) ->
-    [];
-guards(doc) ->
-    "Evaluate guards.";
+%% Evaluate guards.
 guards(Config) when is_list(Config) ->
     ok = guards:guards().
 
-
-
-
-append_1(suite) ->
-    [];
-append_1(doc) ->
-    [];
 append_1(Config) when is_list(Config) ->
     io:format("In append_1~n"),
     io:format("code:which(lists1)=~p~n",
@@ -138,10 +125,6 @@ append_1(Config) when is_list(Config) ->
     ?line [10, [elem]]=spawn_eval(lists1,append,[[[10], [[elem]]]]),
     ok.
 
-append_2(suite) ->
-    [];
-append_2(doc) ->
-    [];
 append_2(Config) when is_list(Config) ->
     io:format("In append_2~n"),
     io:format("code:which(lists1)=~p~n",
@@ -152,10 +135,6 @@ append_2(Config) when is_list(Config) ->
     ?line [10, [elem]]=spawn_eval(lists1,append,[[10], [[elem]]]),
     ok.
 
-reverse(suite) ->
-    [];
-reverse(doc) ->
-    [];
 reverse(Config) when is_list(Config) ->
     ?line ok=reverse_test(0),
     ?line ok=reverse_test(1),
@@ -180,14 +159,11 @@ reverse_test(Num) ->
 	    error
     end.
 
-member(suite) ->
-    [];
-member(doc) ->
-    ["Tests the lists1:member() implementation. The function "
-     "is `non-blocking', and only processes 2000 elements "
-     "at a time.",
-     "This test case depends on lists1:reverse() to work, "
-     "wich is tested in a separate test case."];
+%% Tests the lists1:member() implementation. The function
+%% is `non-blocking', and only processes 2000 elements
+%% at a time.
+%% This test case depends on lists1:reverse() to work,
+%% which is tested in a separate test case.
 member(Config) when list(Config) ->
     ?line ok=member_test(0),
     ?line ok=member_test(1),
@@ -224,10 +200,7 @@ spawn_eval(M,F,A) ->
 evaluator(Pid, M,F,A) ->
     Pid ! (catch apply(M,F,A)).
 
-interpretable(suite) ->
-    [];
-interpretable(doc) ->
-    ["Test int:interpretable/1"];
+%% Test int:interpretable/1.
 interpretable(Config) when is_list(Config) ->
 
     %% First make sure that 'lists1' is not loaded
diff --git a/lib/debugger/test/int_break_SUITE.erl b/lib/debugger/test/int_break_SUITE.erl
index ef770c7a93..b99c448315 100644
--- a/lib/debugger/test/int_break_SUITE.erl
+++ b/lib/debugger/test/int_break_SUITE.erl
@@ -65,8 +65,7 @@ end_per_testcase(_Case, _Config) ->
     ?line ok = io:format("Interpreted modules: ~p", [int:interpreted()]),
     ok.
 
-basic(doc) -> "Tests setting a few break points.";
-basic(suite) -> [];
+%% Tests setting a few break points.
 basic(Config) when list(Config) ->
     ?line int:auto_attach([init], {?MODULE,auto_attach}),
     ?line S1 = [] = ordsets1:new_set(),
@@ -80,8 +79,7 @@ basic(Config) when list(Config) ->
     All = lists:sort(int:all_breaks(ordsets1)),
     ok.
 
-cleanup(doc) -> "Make sure that the auto-attach flag is turned off.";
-cleanup(suite) -> [];
+%% Make sure that the auto-attach flag is turned off.
 cleanup(Config) when list(Config) ->
     ?line int:auto_attach(false),
     ok.
diff --git a/lib/debugger/test/int_eval_SUITE.erl b/lib/debugger/test/int_eval_SUITE.erl
index 524c0c525a..393d5d5a5a 100644
--- a/lib/debugger/test/int_eval_SUITE.erl
+++ b/lib/debugger/test/int_eval_SUITE.erl
@@ -73,10 +73,7 @@ end_per_testcase(_Case, _Config) ->
     ok = io:format("Interpreted modules: ~p", [int:interpreted()]),
     ok.
 
-bifs_outside_erlang(doc) ->
-    "Test that BIFs outside the erlang module are correctly evaluated.";
-bifs_outside_erlang(suite) ->
-    [];
+%% Test that BIFs outside the erlang module are correctly evaluated.
 bifs_outside_erlang(Config) when is_list(Config) ->
     Fun = fun() ->
 		  Id = ?IM:ets_new(),
@@ -90,25 +87,16 @@ bifs_outside_erlang(Config) when is_list(Config) ->
     ?line ok = spawn_eval(Fun),
     ok.
 
-spawning(doc) ->
-    "Try evalutate spawn_link/3.";
-spawning(suite) ->
-    [];
+%% Try evalutate spawn_link/3.
 spawning(Config) when is_list(Config) ->
     ?line ok = spawn_eval(fun() -> ?IM:spawn_test() end).
 
-applying(doc) ->
-    "Try various sorts of applies.";
-applying(suite) ->
-    [];
+%% Try various sorts of applies.
 applying(Config) when is_list(Config) ->
     Fun = fun({number,X}, {number,Y}) -> X+Y end,
     ?line ok = spawn_eval(fun() -> ?IM:apply_test(Fun) end).
 
-catch_and_throw(doc) ->
-    "Test catch and throw/1.";
-catch_and_throw(suite) ->
-    [];
+%% Test catch and throw/1.
 catch_and_throw(Config) when is_list(Config) ->
     {a,ball} = spawn_eval(fun() -> ok = ?IM:catch_a_ball(),
 				   catch ?IM:throw_a_ball() end),
@@ -149,17 +137,11 @@ catch_and_throw(Config) when is_list(Config) ->
     ?line {b, ball} = (catch {error, ?IM:more_nocatch(fun(_) -> throw({b,ball}) end)}),
     ok.
 
-external_call(doc) ->
-    "Test external calls.";
-external_call(suite) ->
-    [];
+%% Test external calls.
 external_call(Config) when is_list(Config) ->
     ?line ok = spawn_eval(fun() -> ?IM:external_call_test({some,stupid,data}) end).
 
-test_module_info(doc) ->
-    "Test the module_info/0,1 functions.";
-test_module_info(suite) ->
-    [];
+%% Test the module_info/0,1 functions.
 test_module_info(Config) when is_list(Config) ->
     ?line ModInfo = ?IM:module_info(),
     ?line {value,{exports,Exp}} = lists:keysearch(exports, 1, ModInfo),
@@ -179,9 +161,7 @@ test_module_info(Config) when is_list(Config) ->
 
     ok.
 
-apply_interpreted_fun(doc) ->
-    "Apply a fun defined in interpreted code.";
-apply_interpreted_fun(suite) -> [];
+%% Apply a fun defined in interpreted code.
 apply_interpreted_fun(Config) when is_list(Config) ->
 
     %% Called from uninterpreted code
@@ -224,9 +204,7 @@ apply_interpreted_fun(Config) when is_list(Config) ->
 
     ok.
 
-apply_uninterpreted_fun(doc) ->
-    "Apply a fun defined outside interpreted code.";
-apply_uninterpreted_fun(suite) -> [];
+%% Apply a fun defined outside interpreted code.
 apply_uninterpreted_fun(Config) when is_list(Config) ->
 
     ?line F1 = fun(snape) ->
@@ -267,8 +245,7 @@ interpreted_exit(Config) when is_list(Config) ->
 	  end,
     ok.
 
-otp_8310(doc) ->
-    "OTP-8310. Bugfixes lc/bc and andalso/orelse.";
+%% OTP-8310. Bugfixes lc/bc and andalso/orelse.
 otp_8310(Config) when is_list(Config) ->
     ?line ok = ?IM:otp_8310(),
     ok.