Merge branch 'bjorn/cuddle-with-tests'

* bjorn/cuddle-with-tests:
  ets_tough_SUITE: Add the gen_server behavior
  ets_tough_SUITE: Remove functions that are never called
  ets_SUITE: Eliminate internal exports used for spawn/apply
  lists_SUITE: Run the droplast/1 test case
  random_{iolist,unicode_list}: Remove unused functions
  stdlib test: Eliminate export_all from re_SUITE and friends
  asn1_SUITE: Make sure that there are no unused functions
  Simplify running of asn1 app tests
  asn1_SUITE: Remove unused functions

12 files changed, 224 insertions, 415 deletions

diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index d346bb9e12..afd063aa8e 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -115,8 +115,7 @@ MODULES= \
 	testImporting \
 	testExtensibilityImplied \
 	asn1_test_lib \
-	asn1_app_test \
-	asn1_appup_test \
+	asn1_app_SUITE \
 	asn1_SUITE \
 	error_SUITE \
 	syntax_SUITE
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 6769a38b12..580c919b9d 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -42,10 +42,11 @@ suite() ->
      {timetrap,{minutes,60}}].
 
 all() ->
-    [{group, compile},
+    [xref,
+     xref_export_all,
+
+     {group, compile},
      {group, parallel},
-     {group, app_test},
-     {group, appup_test},
 
      % TODO: Investigate parallel running of these:
      testComment,
@@ -67,13 +68,8 @@ groups() ->
        ber_optional,
        tagdefault_automatic]},
 
-     {app_test, [], [{asn1_app_test, all}]},
-
-     {appup_test, [], [{asn1_appup_test, all}]},
-
      {parallel, Parallel,
       [cover,
-       xref,
        {group, ber},
        % Uses 'P-Record', 'Constraints', 'MEDIA-GATEWAY-CONTROL'...
        {group, [], [parse,
@@ -1047,18 +1043,6 @@ test_modified_x420(Config, Rule, Opts) ->
     test_modified_x420:test(Config).
 
 
-testX420() ->
-    [{timetrap,{minutes,90}}].
-testX420(Config) ->
-    case erlang:system_info(system_architecture) of
-	"sparc-sun-solaris2.10" ->
-	    {skip,"Too slow for an old Sparc"};
-	_ ->
-	    Rule = ber,
-	    testX420:compile(Rule, [der], Config),
-	    ok = testX420:ticket7759(Rule, Config)
-    end.
-
 test_x691(Config) ->
     test(Config, fun test_x691/3, [per, uper]).
 test_x691(Config, Rule, Opts) ->
@@ -1325,16 +1309,72 @@ ticket7904(Config) ->
     {ok,_} = 'RANAPextract1':encode('InitiatingMessage', Val1),
     {ok,_} = 'RANAPextract1':encode('InitiatingMessage', Val1).
 
+
+%% Make sure that functions exported from other modules are
+%% actually used.
+
 xref(_Config) ->
-    xref:start(s),
-    xref:set_default(s, [{verbose,false},{warnings,false},{builtins,true}]),
+    S = ?FUNCTION_NAME,
+    xref:start(S),
+    xref:set_default(S, [{verbose,false},{warnings,false},{builtins,true}]),
     Test = filename:dirname(code:which(?MODULE)),
-    {ok,_PMs} = xref:add_directory(s, Test),
-    UnusedExports = "X - XU - asn1_appup_test - asn1_app_test - \".*_SUITE\" : Mod",
-    case xref:q(s, UnusedExports) of
+    {ok,_PMs} = xref:add_directory(S, Test),
+    Q = "X - XU - \".*_SUITE\" : Mod",
+    UnusedExports = xref:q(S, Q),
+    xref:stop(S),
+    case UnusedExports of
 	{ok,[]} ->
 	    ok;
 	{ok,[_|_]=Res} ->
 	    io:format("Exported, but unused: ~p\n", [Res]),
 	    ?t:fail()
     end.
+
+%% Ensure that all functions that are implicitly exported by
+%% 'export_all' in this module are actually used.
+
+xref_export_all(_Config) ->
+    S = ?FUNCTION_NAME,
+    xref:start(S),
+    xref:set_default(S, [{verbose,false},{warnings,false},{builtins,true}]),
+    {ok,_PMs} = xref:add_module(S, code:which(?MODULE)),
+    AllCalled = all_called(),
+    Def = "Called := " ++ lists:flatten(io_lib:format("~p", [AllCalled])),
+    {ok,_} = xref:q(S, Def),
+    {ok,Unused} = xref:q(S, "X - Called - range (closure E | Called)"),
+    xref:stop(S),
+    case Unused of
+        [] ->
+            ok;
+        [_|_] ->
+            S = [io_lib:format("~p:~p/~p\n", [M,F,A]) || {M,F,A} <- Unused],
+            io:format("There are unused functions:\n\n~s\n", [S]),
+            ?t:fail(unused_functions)
+    end.
+
+%% Collect all functions that common_test will call in this module.
+
+all_called() ->
+    [{?MODULE,end_per_group,2},
+     {?MODULE,end_per_suite,1},
+     {?MODULE,end_per_testcase,2},
+     {?MODULE,init_per_group,2},
+     {?MODULE,init_per_suite,1},
+     {?MODULE,init_per_testcase,2},
+     {?MODULE,suite,0}] ++
+        all_called_1(all() ++ groups()).
+
+all_called_1([{_,_}|T]) ->
+    all_called_1(T);
+all_called_1([{_Name,_Flags,Fs}|T]) ->
+    all_called_1(Fs ++ T);
+all_called_1([F|T]) when is_atom(F) ->
+    L = case erlang:function_exported(?MODULE, F, 0) of
+            false ->
+                [{?MODULE,F,1}];
+            true ->
+                [{?MODULE,F,0},{?MODULE,F,1}]
+        end,
+    L ++ all_called_1(T);
+all_called_1([]) ->
+    [].
diff --git a/lib/asn1/test/asn1_app_test.erl b/lib/asn1/test/asn1_app_SUITE.erl
index 028322f555..c089a7267c 100644
--- a/lib/asn1/test/asn1_app_test.erl
+++ b/lib/asn1/test/asn1_app_SUITE.erl
@@ -21,23 +21,24 @@
 %%----------------------------------------------------------------------
 %% Purpose: Verify the application specifics of the asn1 application
 %%----------------------------------------------------------------------
--module(asn1_app_test).
-
--compile(export_all).
+-module(asn1_app_SUITE).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2,
+         init_per_suite/1,end_per_suite/1,
+         appup/1,fields/1,modules/1,export_all/1,app_depend/1]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-all() -> 
-    [fields, modules, exportall, app_depend].
+all() ->
+    [appup, fields, modules, export_all, app_depend].
 
-groups() -> 
+groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -65,12 +66,15 @@ is_app(App) ->
 end_per_suite(Config) when is_list(Config) ->
     Config.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+appup(Config) when is_list(Config) ->
+    ok = test_server:appup_test(asn1).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% .
 fields(Config) when is_list(Config) ->
-    AppFile = key1search(app_file, Config),
+    AppFile = key1find(app_file, Config),
     Fields = [vsn, description, modules, registered, applications],
     case check_fields(Fields, AppFile, []) of
 	[] ->
@@ -96,10 +100,9 @@ check_field(Name, AppFile, Missing) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% .
 modules(Config) when is_list(Config) ->
-    AppFile  = key1search(app_file, Config),
-    Mods     = key1search(modules, AppFile),
+    AppFile  = key1find(app_file, Config),
+    Mods     = key1find(modules, AppFile),
     EbinList = get_ebin_mods(asn1),
     case missing_modules(Mods, EbinList, []) of
 	[] ->
@@ -112,10 +115,9 @@ modules(Config) when is_list(Config) ->
 	    ok;
 	Extra ->
 	    check_asn1ct_modules(Extra)
-%	    throw({error, {extra_modules, Extra}})
     end,
     {ok, Mods}.
-	    
+
 get_ebin_mods(App) ->
     LibDir  = code:lib_dir(App),
     EbinDir = filename:join([LibDir,"ebin"]),
@@ -166,10 +168,9 @@ extra_modules(Mods, [Mod|Ebins], Extra) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-%% .
-exportall(Config) when is_list(Config) ->
-    AppFile = key1search(app_file, Config),
-    Mods    = key1search(modules, AppFile),
+export_all(Config) when is_list(Config) ->
+    AppFile = key1find(app_file, Config),
+    Mods    = key1find(modules, AppFile),
     check_export_all(Mods).
 
 
@@ -180,10 +181,10 @@ check_export_all([Mod|Mods]) ->
 	{'EXIT', {undef, _}} ->
 	    check_export_all(Mods);
 	O ->
-            case lists:keysearch(options, 1, O) of
+            case lists:keyfind(options, 1, O) of
                 false ->
                     check_export_all(Mods);
-                {value, {options, List}} ->
+                {options, List} ->
                     case lists:member(export_all, List) of
                         true ->
 			    throw({error, {export_all, Mod}});
@@ -193,13 +194,12 @@ check_export_all([Mod|Mods]) ->
             end
     end.
 
-	    
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% .
 app_depend(Config) when is_list(Config) ->
-    AppFile = key1search(app_file, Config),
-    Apps    = key1search(applications, AppFile),
+    AppFile = key1find(app_file, Config),
+    Apps    = key1find(applications, AppFile),
     check_apps(Apps).
 
 
@@ -220,10 +220,10 @@ check_apps([App|Apps]) ->
 fail(Reason) ->
     exit({suite_failed, Reason}).
 
-key1search(Key, L) ->
-    case lists:keysearch(Key, 1, L) of
-	undefined ->
+key1find(Key, L) ->
+    case lists:keyfind(Key, 1, L) of
+	false ->
 	    fail({not_found, Key, L});
-	{value, {Key, Value}} ->
+	{Key, Value} ->
 	    Value
     end.
diff --git a/lib/asn1/test/asn1_appup_test.erl b/lib/asn1/test/asn1_appup_test.erl
deleted file mode 100644
index 54540e53cc..0000000000
--- a/lib/asn1/test/asn1_appup_test.erl
+++ /dev/null
@@ -1,58 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
-%%
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%%
-%% %CopyrightEnd%
-%%
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Verify the application specifics of the asn1 application
-%%----------------------------------------------------------------------
--module(asn1_appup_test).
--compile(export_all).
--include_lib("common_test/include/ct.hrl").
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-all() -> 
-    [appup].
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-init_per_suite(Config) when is_list(Config) ->
-    Config.
-    
-
-end_per_suite(Config) when is_list(Config) ->
-    Config.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-appup() ->
-    [{doc, "perform a simple check of the asn1 appup file"}].
-appup(Config) when is_list(Config) ->
-    ok = ?t:appup_test(asn1).
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index f68d5eca3f..8581440d58 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -22,7 +22,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
 	 init_per_group/2,end_per_group/2]).
 -export([default/1,setbag/1,badnew/1,verybadnew/1,named/1,keypos2/1,
-	 privacy/1,privacy_owner/2]).
+	 privacy/1]).
 -export([empty/1,badinsert/1]).
 -export([time_lookup/1,badlookup/1,lookup_order/1]).
 -export([delete_elem/1,delete_tab/1,delete_large_tab/1,
@@ -82,27 +82,6 @@
 %% Convenience for manual testing
 -export([random_test/0]).
 
-%% internal exports
--export([dont_make_worse_sub/0, make_better_sub1/0, make_better_sub2/0]).
--export([t_repair_continuation_do/1, t_bucket_disappears_do/1,
-	 select_fail_do/1, whitebox_1/1, whitebox_2/1, t_delete_all_objects_do/1,
-	 t_delete_object_do/1, t_init_table_do/1, t_insert_list_do/1,
-	 update_element_opts/1, update_element_opts/4, update_element/4, update_element_do/4,
-	 update_element_neg/1, update_element_neg_do/1, update_counter_do/1, update_counter_neg/1,
-	 evil_update_counter_do/1, fixtable_next_do/1, heir_do/1, give_away_do/1, setopts_do/1,
-	 rename_do/1, rename_unnamed_do/1, interface_equality_do/1, ordered_match_do/1,
-	 ordered_do/1, privacy_do/1, empty_do/1, badinsert_do/1, time_lookup_do/1,
-	 lookup_order_do/1, lookup_element_mult_do/1, delete_tab_do/1, delete_elem_do/1,
-	 match_delete_do/1, match_delete3_do/1, firstnext_do/1,
-	 slot_do/1, match1_do/1, match2_do/1, match_object_do/1, match_object2_do/1,
-	 misc1_do/1, safe_fixtable_do/1, info_do/1, dups_do/1, heavy_lookup_do/1,
-	 heavy_lookup_element_do/1, member_do/1, otp_5340_do/1, otp_7665_do/1, meta_wb_do/1,
-	 do_heavy_concurrent/1, tab2file2_do/2, exit_large_table_owner_do/2,
-         types_do/1, sleeper/0, memory_do/1, update_counter_with_default_do/1,
-	 update_counter_table_growth_do/1,
-	 ms_tracee_dummy/1, ms_tracee_dummy/2, ms_tracee_dummy/3, ms_tracee_dummy/4
-	]).
-
 -export([t_select_reverse/1]).
 
 -include_lib("common_test/include/ct.hrl").
@@ -228,7 +207,7 @@ memory_check_summary(_Config) ->
 
 %% Test that a disappearing bucket during select of a non-fixed table works.
 t_bucket_disappears(Config) when is_list(Config) ->
-    repeat_for_opts(t_bucket_disappears_do).
+    repeat_for_opts(fun t_bucket_disappears_do/1).
 
 t_bucket_disappears_do(Opts) ->
     EtsMem = etsmem(),
@@ -396,11 +375,16 @@ ms_tracer_collect(Tracee, Ref, Acc) ->
 ms_tracee(Parent, CallArgList) ->
     Parent ! {self(), ready},
     receive start -> ok end,
-    lists:foreach(fun(Args) ->
-			  erlang:apply(?MODULE, ms_tracee_dummy, tuple_to_list(Args))
-		  end, CallArgList).
-
-
+    F = fun({A1}) ->
+                ms_tracee_dummy(A1);
+           ({A1,A2}) ->
+                   ms_tracee_dummy(A1, A2);
+           ({A1,A2,A3}) ->
+                ms_tracee_dummy(A1, A2, A3);
+           ({A1,A2,A3,A4}) ->
+                ms_tracee_dummy(A1, A2, A3, A4)
+        end,
+    lists:foreach(F, CallArgList).
 
 ms_tracee_dummy(_) -> ok.
 ms_tracee_dummy(_,_) -> ok.
@@ -418,7 +402,7 @@ assert_eq(A,B) ->
 
 %% Test ets:repair_continuation/2.
 t_repair_continuation(Config) when is_list(Config) ->
-    repeat_for_opts(t_repair_continuation_do).
+    repeat_for_opts(fun t_repair_continuation_do/1).
 
 
 t_repair_continuation_do(Opts) ->
@@ -564,7 +548,8 @@ default(Config) when is_list(Config) ->
 %% Test that select fails even if nothing can match.
 select_fail(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    repeat_for_opts(select_fail_do, [all_types,write_concurrency]),
+    repeat_for_opts(fun select_fail_do/1,
+                    [all_types,write_concurrency]),
     verify_etsmem(EtsMem).
 
 select_fail_do(Opts) ->
@@ -594,7 +579,7 @@ select_fail_do(Opts) ->
 %% Whitebox test of ets:info(X, memory).
 memory(Config) when is_list(Config) ->
     ok = chk_normal_tab_struct_size(),
-    repeat_for_opts(memory_do,[compressed]),
+    repeat_for_opts(fun memory_do/1, [compressed]),
     catch erts_debug:set_internal_state(available_internal_state, false).
 
 memory_do(Opts) ->
@@ -704,12 +689,12 @@ adjust_xmem([_T1,_T2,_T3,_T4], {A0,B0,C0,D0} = _Mem0, EstCnt) ->
 %% Misc. whitebox tests
 t_whitebox(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    repeat_for_opts(whitebox_1),
-    repeat_for_opts(whitebox_1),
-    repeat_for_opts(whitebox_1),
-    repeat_for_opts(whitebox_2),
-    repeat_for_opts(whitebox_2),
-    repeat_for_opts(whitebox_2),
+    repeat_for_opts(fun whitebox_1/1),
+    repeat_for_opts(fun whitebox_1/1),
+    repeat_for_opts(fun whitebox_1/1),
+    repeat_for_opts(fun whitebox_2/1),
+    repeat_for_opts(fun whitebox_2/1),
+    repeat_for_opts(fun whitebox_2/1),
     verify_etsmem(EtsMem).
 
 whitebox_1(Opts) ->
@@ -774,7 +759,7 @@ check_badarg({'EXIT', {badarg, [{M,F,A,_} | _]}}, M, F, Args)  ->
 %% Test ets:delete_all_objects/1.
 t_delete_all_objects(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    repeat_for_opts(t_delete_all_objects_do),
+    repeat_for_opts(fun t_delete_all_objects_do/1),
     verify_etsmem(EtsMem).
 
 get_kept_objects(T) ->
@@ -808,7 +793,7 @@ t_delete_all_objects_do(Opts) ->
 %% Test ets:delete_object/2.
 t_delete_object(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    repeat_for_opts(t_delete_object_do),
+    repeat_for_opts(fun t_delete_object_do/1),
     verify_etsmem(EtsMem).
 
 t_delete_object_do(Opts) ->
@@ -881,7 +866,7 @@ make_init_fun(N) ->
 %% Test ets:init_table/2.
 t_init_table(Config) when is_list(Config)->
     EtsMem = etsmem(),
-    repeat_for_opts(t_init_table_do),
+    repeat_for_opts(fun t_init_table_do/1),
     verify_etsmem(EtsMem).
 
 t_init_table_do(Opts) ->
@@ -957,7 +942,7 @@ t_insert_new(Config) when is_list(Config) ->
 %% Test ets:insert/2 with list of objects.
 t_insert_list(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    repeat_for_opts(t_insert_list_do),
+    repeat_for_opts(fun t_insert_list_do/1),
     verify_etsmem(EtsMem).
 
 t_insert_list_do(Opts) ->
@@ -1187,7 +1172,7 @@ partly_bound(Config) when is_list(Config) ->
     end.
 
 dont_make_worse() ->
-    seventyfive_percent_success({?MODULE,dont_make_worse_sub,[]},0,0,10).
+    seventyfive_percent_success(fun dont_make_worse_sub/0, 0, 0, 10).
 
 dont_make_worse_sub() ->
     T = build_table([a,b],[a,b],15000),
@@ -1199,8 +1184,9 @@ dont_make_worse_sub() ->
     ok.
 
 make_better() ->
-    fifty_percent_success({?MODULE,make_better_sub2,[]},0,0,10),
-    fifty_percent_success({?MODULE,make_better_sub1,[]},0,0,10).
+    fifty_percent_success(fun make_better_sub2/0, 0, 0, 10),
+    fifty_percent_success(fun make_better_sub1/0, 0, 0, 10).
+
 make_better_sub1() ->
     T = build_table2([a,b],[a,b],15000),
     T1 = time_match_object(T,{'_',1500,a,a}, [{{1500,a,a},1500,a,a}]),
@@ -1485,7 +1471,7 @@ do_random_test() ->
 %% Ttest various variants of update_element.
 update_element(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    repeat_for_opts(update_element_opts),
+    repeat_for_opts(fun update_element_opts/1),
     verify_etsmem(EtsMem).
 
 update_element_opts(Opts) ->
@@ -1647,7 +1633,7 @@ update_element_neg_do(T) ->
 %% test various variants of update_counter.
 update_counter(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    repeat_for_opts(update_counter_do),
+    repeat_for_opts(fun update_counter_do/1),
     verify_etsmem(EtsMem).
 
 update_counter_do(Opts) ->
@@ -1868,7 +1854,7 @@ evil_update_counter(Config) when is_list(Config) ->
     ordsets:module_info(),
     rand:module_info(),
 
-    repeat_for_opts(evil_update_counter_do).
+    repeat_for_opts(fun evil_update_counter_do/1).
 
 evil_update_counter_do(Opts) ->
     EtsMem = etsmem(),
@@ -1915,7 +1901,7 @@ evil_counter_1(Iter, T) ->
     evil_counter_1(Iter-1, T).
 
 update_counter_with_default(Config) when is_list(Config) ->
-    repeat_for_opts(update_counter_with_default_do).
+    repeat_for_opts(fun update_counter_with_default_do/1).
 
 update_counter_with_default_do(Opts) ->
     T1 = ets_new(a, [set | Opts]),
@@ -1953,7 +1939,7 @@ update_counter_with_default_do(Opts) ->
     ok.
 
 update_counter_table_growth(_Config) ->
-    repeat_for_opts(update_counter_table_growth_do).
+    repeat_for_opts(fun update_counter_table_growth_do/1).
 
 update_counter_table_growth_do(Opts) ->
     Set = ets_new(b, [set | Opts]),
@@ -1964,7 +1950,8 @@ update_counter_table_growth_do(Opts) ->
 
 %% Check that a first-next sequence always works on a fixed table.
 fixtable_next(Config) when is_list(Config) ->
-    repeat_for_opts(fixtable_next_do, [write_concurrency,all_types]).
+    repeat_for_opts(fun fixtable_next_do/1,
+                    [write_concurrency,all_types]).
 
 fixtable_next_do(Opts) ->
     EtsMem = etsmem(),
@@ -2104,7 +2091,7 @@ write_concurrency(Config) when is_list(Config) ->
 
 %% The 'heir' option.
 heir(Config) when is_list(Config) ->
-    repeat_for_opts(heir_do).
+    repeat_for_opts(fun heir_do/1).
 
 heir_do(Opts) ->
     EtsMem = etsmem(),
@@ -2244,7 +2231,7 @@ heir_1(HeirData,Mode,Opts) ->
 
 %% Test ets:give_way/3.
 give_away(Config) when is_list(Config) ->
-    repeat_for_opts(give_away_do).
+    repeat_for_opts(fun give_away_do/1).
 
 give_away_do(Opts) ->
     T = ets_new(foo,[named_table, private | Opts]),
@@ -2325,7 +2312,7 @@ give_away_receiver(T, Giver) ->
 
 %% Test ets:setopts/2.
 setopts(Config) when is_list(Config) ->
-    repeat_for_opts(setopts_do,[write_concurrency,all_types]).
+    repeat_for_opts(fun setopts_do/1, [write_concurrency,all_types]).
 
 setopts_do(Opts) ->
     Self = self(),
@@ -2475,7 +2462,7 @@ bad_table_call(T,{F,Args,_,{return,Return}}) ->
 
 %% Check rename of ets tables.
 rename(Config) when is_list(Config) ->
-    repeat_for_opts(rename_do, [write_concurrency, all_types]).
+    repeat_for_opts(fun rename_do/1, [write_concurrency, all_types]).
 
 rename_do(Opts) ->
     EtsMem = etsmem(),
@@ -2490,7 +2477,8 @@ rename_do(Opts) ->
 
 %% Check rename of unnamed ets table.
 rename_unnamed(Config) when is_list(Config) ->
-    repeat_for_opts(rename_unnamed_do,[write_concurrency,all_types]).
+    repeat_for_opts(fun rename_unnamed_do/1,
+                    [write_concurrency,all_types]).
 
 rename_unnamed_do(Opts) ->
     EtsMem = etsmem(),
@@ -2565,7 +2553,7 @@ evil_create_fixed_tab() ->
 %% Tests that the return values and errors are equal for set's and
 %% ordered_set's where applicable.
 interface_equality(Config) when is_list(Config) ->
-    repeat_for_opts(interface_equality_do).
+    repeat_for_opts(fun interface_equality_do/1).
 
 interface_equality_do(Opts) ->
     EtsMem = etsmem(),
@@ -2629,7 +2617,7 @@ maybe_sort(Any) ->
 
 %% Test match, match_object and match_delete in ordered set's.
 ordered_match(Config) when is_list(Config)->
-    repeat_for_opts(ordered_match_do).
+    repeat_for_opts(fun ordered_match_do/1).
 
 ordered_match_do(Opts) ->
     EtsMem = etsmem(),
@@ -2675,7 +2663,7 @@ ordered_match_do(Opts) ->
 
 %% Test basic functionality in ordered_set's.
 ordered(Config) when is_list(Config) ->
-    repeat_for_opts(ordered_do).
+    repeat_for_opts(fun ordered_do/1).
 
 ordered_do(Opts) ->
     EtsMem = etsmem(),
@@ -2801,12 +2789,13 @@ keypos2(Config) when is_list(Config) ->
 %% Privacy check. Check that a named(public/private/protected) table
 %% cannot be read by the wrong process(es).
 privacy(Config) when is_list(Config) ->
-    repeat_for_opts(privacy_do).
+    repeat_for_opts(fun privacy_do/1).
 
 privacy_do(Opts) ->
     EtsMem = etsmem(),
     process_flag(trap_exit,true),
-    Owner = my_spawn_link(?MODULE,privacy_owner,[self(),Opts]),
+    Parent = self(),
+    Owner = my_spawn_link(fun() -> privacy_owner(Parent, Opts) end),
     receive
 	{'EXIT',Owner,Reason} ->
 	    exit({privacy_test,Reason});
@@ -2886,7 +2875,7 @@ rotate_tuple(Tuple, N) ->
 
 %% Check lookup in an empty table and lookup of a non-existing key.
 empty(Config) when is_list(Config) ->
-    repeat_for_opts(empty_do).
+    repeat_for_opts(fun empty_do/1).
 
 empty_do(Opts) ->
     EtsMem = etsmem(),
@@ -2899,7 +2888,7 @@ empty_do(Opts) ->
 
 %% Check proper return values for illegal insert operations.
 badinsert(Config) when is_list(Config) ->
-    repeat_for_opts(badinsert_do).
+    repeat_for_opts(fun badinsert_do/1).
 
 badinsert_do(Opts) ->
     EtsMem = etsmem(),
@@ -2923,7 +2912,7 @@ badinsert_do(Opts) ->
 time_lookup(Config) when is_list(Config) ->
     %% just for timing, really
     EtsMem = etsmem(),
-    Values = repeat_for_opts(time_lookup_do),
+    Values = repeat_for_opts(fun time_lookup_do/1),
     verify_etsmem(EtsMem),
     {comment,lists:flatten(io_lib:format(
 			     "~p ets lookups/s",[Values]))}.
@@ -2957,7 +2946,8 @@ badlookup(Config) when is_list(Config) ->
 %% Test that lookup returns objects in order of insertion for bag and dbag.
 lookup_order(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    repeat_for_opts(lookup_order_do, [write_concurrency,[bag,duplicate_bag]]),
+    repeat_for_opts(fun lookup_order_do/1,
+                    [write_concurrency,[bag,duplicate_bag]]),
     verify_etsmem(EtsMem),
     ok.
 
@@ -3048,7 +3038,7 @@ fill_tab(Tab,Val) ->
 
 %% OTP-2386. Multiple return elements.
 lookup_element_mult(Config) when is_list(Config) ->
-    repeat_for_opts(lookup_element_mult_do).
+    repeat_for_opts(fun lookup_element_mult_do/1).
 
 lookup_element_mult_do(Opts) ->
     EtsMem = etsmem(),
@@ -3086,7 +3076,8 @@ lem_crash_3(T) ->
 
 %% Check delete of an element inserted in a `filled' table.
 delete_elem(Config) when is_list(Config) ->
-    repeat_for_opts(delete_elem_do, [write_concurrency, all_types]).
+    repeat_for_opts(fun delete_elem_do/1,
+                    [write_concurrency, all_types]).
 
 delete_elem_do(Opts) ->
     EtsMem = etsmem(),
@@ -3103,7 +3094,8 @@ delete_elem_do(Opts) ->
 %% Check that ets:delete() works and releases the name of the
 %% deleted table.
 delete_tab(Config) when is_list(Config) ->
-    repeat_for_opts(delete_tab_do,[write_concurrency,all_types]).
+    repeat_for_opts(fun delete_tab_do/1,
+                    [write_concurrency,all_types]).
 
 delete_tab_do(Opts) ->
     Name = foo,
@@ -3301,10 +3293,14 @@ exit_large_table_owner(Config) when is_list(Config) ->
 				     end, 1)
 	     end,
     EtsMem = etsmem(),
-    repeat_for_opts({exit_large_table_owner_do,{FEData,Config}}),
+    repeat_for_opts(fun(Opts) ->
+                            exit_large_table_owner_do(Opts,
+                                                      FEData,
+                                                      Config)
+                    end),
     verify_etsmem(EtsMem).
 
-exit_large_table_owner_do(Opts,{FEData,Config}) ->
+exit_large_table_owner_do(Opts, FEData, Config) ->
     verify_rescheduling_exit(Config, FEData, [named_table | Opts], true, 1, 1),
     verify_rescheduling_exit(Config, FEData, Opts, false, 1, 1).
 
@@ -3472,7 +3468,8 @@ baddelete(Config) when is_list(Config) ->
 %% Check that match_delete works. Also tests tab2list function.
 match_delete(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    repeat_for_opts(match_delete_do,[write_concurrency,all_types]),
+    repeat_for_opts(fun match_delete_do/1,
+                    [write_concurrency,all_types]),
     verify_etsmem(EtsMem).
 
 match_delete_do(Opts) ->
@@ -3489,7 +3486,7 @@ match_delete_do(Opts) ->
 
 %% OTP-3005: check match_delete with constant argument.
 match_delete3(Config) when is_list(Config) ->
-    repeat_for_opts(match_delete3_do).
+    repeat_for_opts(fun match_delete3_do/1).
 
 match_delete3_do(Opts) ->
     EtsMem = etsmem(),
@@ -3514,7 +3511,7 @@ match_delete3_do(Opts) ->
 
 %% Test ets:first/1 & ets:next/2.
 firstnext(Config) when is_list(Config) ->
-    repeat_for_opts(firstnext_do).
+    repeat_for_opts(fun firstnext_do/1).
 
 firstnext_do(Opts) ->
     EtsMem = etsmem(),
@@ -3572,7 +3569,7 @@ dyn_lookup(T, K) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 slot(Config) when is_list(Config) ->
-    repeat_for_opts(slot_do).
+    repeat_for_opts(fun slot_do/1).
 
 slot_do(Opts) ->
     EtsMem = etsmem(),
@@ -3597,7 +3594,7 @@ slot_loop(Tab,SlotNo,EltsSoFar) ->
 
 
 match1(Config) when is_list(Config) ->
-    repeat_for_opts(match1_do).
+    repeat_for_opts(fun match1_do/1).
 
 match1_do(Opts) ->
     EtsMem = etsmem(),
@@ -3633,7 +3630,7 @@ match1_do(Opts) ->
 
 %% Test match with specified keypos bag table.
 match2(Config) when is_list(Config) ->
-    repeat_for_opts(match2_do).
+    repeat_for_opts(fun match2_do/1).
 
 match2_do(Opts) ->
     EtsMem = etsmem(),
@@ -3660,7 +3657,7 @@ match2_do(Opts) ->
 
 %% Some ets:match_object tests.
 match_object(Config) when is_list(Config) ->
-    repeat_for_opts(match_object_do).
+    repeat_for_opts(fun match_object_do/1).
 
 match_object_do(Opts) ->
     EtsMem = etsmem(),
@@ -3760,7 +3757,7 @@ match_object_do(Opts) ->
 %% Tests that db_match_object does not generate a `badarg' when
 %% resuming a search with no previous matches.
 match_object2(Config) when is_list(Config) ->
-    repeat_for_opts(match_object2_do).
+    repeat_for_opts(fun match_object2_do/1).
 
 match_object2_do(Opts) ->
     EtsMem = etsmem(),
@@ -3796,7 +3793,7 @@ tab2list(Config) when is_list(Config) ->
 %% Simple general small test.  If this fails, ets is in really bad
 %% shape.
 misc1(Config) when is_list(Config) ->
-    repeat_for_opts(misc1_do).
+    repeat_for_opts(fun misc1_do/1).
 
 misc1_do(Opts) ->
     EtsMem = etsmem(),
@@ -3814,7 +3811,7 @@ misc1_do(Opts) ->
 
 %% Check the safe_fixtable function.
 safe_fixtable(Config) when is_list(Config) ->
-    repeat_for_opts(safe_fixtable_do).
+    repeat_for_opts(fun safe_fixtable_do/1).
 
 safe_fixtable_do(Opts) ->
     EtsMem = etsmem(),
@@ -3872,7 +3869,7 @@ safe_fixtable_do(Opts) ->
 
 %% Tests ets:info result for required tuples.
 info(Config) when is_list(Config) ->
-    repeat_for_opts(info_do).
+    repeat_for_opts(fun info_do/1).
 
 info_do(Opts) ->
     EtsMem = etsmem(),
@@ -3904,7 +3901,7 @@ info_do(Opts) ->
 
 %% Test various duplicate_bags stuff.
 dups(Config) when is_list(Config) ->
-    repeat_for_opts(dups_do).
+    repeat_for_opts(fun dups_do/1).
 
 dups_do(Opts) ->
     EtsMem = etsmem(),
@@ -3970,7 +3967,9 @@ tab2file_do(FName, Opts) ->
 
 %% Check the ets:tab2file function on a filled set/bag type ets table.
 tab2file2(Config) when is_list(Config) ->
-    repeat_for_opts({tab2file2_do,Config}, [[set,bag],compressed]).
+    repeat_for_opts(fun(Opts) ->
+                            tab2file2_do(Opts, Config)
+                    end, [[set,bag],compressed]).
 
 tab2file2_do(Opts, Config) ->
     EtsMem = etsmem(),
@@ -4234,7 +4233,7 @@ make_sub_binary(List, Num) when is_list(List) ->
 
 %% Perform multiple lookups for every key in a large table.
 heavy_lookup(Config) when is_list(Config) ->
-    repeat_for_opts(heavy_lookup_do).
+    repeat_for_opts(fun heavy_lookup_do/1).
 
 heavy_lookup_do(Opts) ->
     EtsMem = etsmem(),
@@ -4257,7 +4256,7 @@ do_lookup(Tab, N) ->
 
 %% Perform multiple lookups for every element in a large table.
 heavy_lookup_element(Config) when is_list(Config) ->
-    repeat_for_opts(heavy_lookup_element_do).
+    repeat_for_opts(fun heavy_lookup_element_do/1).
 
 heavy_lookup_element_do(Opts) ->
     EtsMem = etsmem(),
@@ -4285,7 +4284,7 @@ do_lookup_element(Tab, N, M) ->
 
 heavy_concurrent(Config) when is_list(Config) ->
     ct:timetrap({minutes,30}), %% valgrind needs a lot of time
-    repeat_for_opts(do_heavy_concurrent).
+    repeat_for_opts(fun do_heavy_concurrent/1).
 
 do_heavy_concurrent(Opts) ->
     Size = 10000,
@@ -4370,7 +4369,7 @@ foldr_ordered(Config) when is_list(Config) ->
 
 %% Test ets:member BIF.
 member(Config) when is_list(Config) ->
-    repeat_for_opts(member_do, [write_concurrency, all_types]).
+    repeat_for_opts(fun member_do/1, [write_concurrency, all_types]).
 
 member_do(Opts) ->
     EtsMem = etsmem(),
@@ -4453,26 +4452,26 @@ time_match(Tab,Match) ->
 seventyfive_percent_success(_,S,Fa,0) ->
     true = (S > ((S + Fa) * 0.75));
 
-seventyfive_percent_success({M,F,A},S,Fa,N) ->
-    case (catch apply(M,F,A)) of
-	{'EXIT', _} ->
-	    seventyfive_percent_success({M,F,A},S,Fa+1,N-1);
-	_ ->
-	    seventyfive_percent_success({M,F,A},S+1,Fa,N-1)
+seventyfive_percent_success(F, S, Fa, N) when is_function(F, 0) ->
+    try F() of
+        _ ->
+	    seventyfive_percent_success(F, S+1, Fa, N-1)
+    catch error:_ ->
+	    seventyfive_percent_success(F, S, Fa+1, N-1)
     end.
 
 fifty_percent_success(_,S,Fa,0) ->
     true = (S > ((S + Fa) * 0.5));
 
-fifty_percent_success({M,F,A},S,Fa,N) ->
-    case (catch apply(M,F,A)) of
-	{'EXIT', _} ->
-	    fifty_percent_success({M,F,A},S,Fa+1,N-1);
-	_ ->
-	    fifty_percent_success({M,F,A},S+1,Fa,N-1)
+fifty_percent_success(F, S, Fa, N) when is_function(F, 0) ->
+    try F() of
+        _ ->
+	    fifty_percent_success(F, S+1, Fa, N-1)
+    catch
+        error:_ ->
+	    fifty_percent_success(F, S, Fa+1, N-1)
     end.
 
-
 create_random_string(0) ->
     [];
 
@@ -4811,7 +4810,7 @@ otp_6338(Config) when is_list(Config) ->
 
 %% Elements could come in the wrong order in a bag if a rehash occurred.
 otp_5340(Config) when is_list(Config) ->
-    repeat_for_opts(otp_5340_do).
+    repeat_for_opts(fun otp_5340_do/1).
 
 otp_5340_do(Opts) ->
     N = 3000,
@@ -4847,7 +4846,7 @@ verify2(_Err, _) ->
 
 %% delete_object followed by delete on fixed bag failed to delete objects.
 otp_7665(Config) when is_list(Config) ->
-    repeat_for_opts(otp_7665_do).
+    repeat_for_opts(fun otp_7665_do/1).
 
 otp_7665_do(Opts) ->
     Tab = ets_new(otp_7665,[bag | Opts]),
@@ -4877,7 +4876,7 @@ otp_7665_act(Tab,Min,Max,DelNr) ->
 %% Whitebox testing of meta name table hashing.
 meta_wb(Config) when is_list(Config) ->
     EtsMem = etsmem(),
-    repeat_for_opts(meta_wb_do),
+    repeat_for_opts(fun meta_wb_do/1),
     verify_etsmem(EtsMem).
 
 
@@ -5446,7 +5445,7 @@ smp_select_delete(Config) when is_list(Config) ->
 %% Test different types.
 types(Config) when is_list(Config) ->
     init_externals(),
-    repeat_for_opts(types_do,[[set,ordered_set],compressed]).
+    repeat_for_opts(fun types_do/1, [[set,ordered_set],compressed]).
 
 types_do(Opts) ->
     EtsMem = etsmem(),
@@ -5848,12 +5847,8 @@ log_test_proc(Proc) when is_pid(Proc) ->
     Proc.
 
 my_spawn(Fun) -> log_test_proc(spawn(Fun)).
-%%my_spawn(M,F,A) -> log_test_proc(spawn(M,F,A)).
-%%my_spawn(N,M,F,A) -> log_test_proc(spawn(N,M,F,A)).
 
 my_spawn_link(Fun) -> log_test_proc(spawn_link(Fun)).
-my_spawn_link(M,F,A) -> log_test_proc(spawn_link(M,F,A)).
-%%my_spawn_link(N,M,F,A) -> log_test_proc(spawn_link(N,M,F,A)).
 
 my_spawn_opt(Fun,Opts) ->
     case spawn_opt(Fun,Opts) of
@@ -6096,7 +6091,7 @@ make_port() ->
     open_port({spawn, "efile"}, [eof]).
 
 make_pid() ->
-    spawn_link(?MODULE, sleeper, []).
+    spawn_link(fun sleeper/0).
 
 sleeper() ->
     receive after infinity -> ok end.
@@ -6232,11 +6227,7 @@ make_unaligned_sub_binary(List) ->
 repeat_for_opts(F) ->
     repeat_for_opts(F, [write_concurrency, read_concurrency, compressed]).
 
-repeat_for_opts(F, OptGenList) when is_atom(F) ->
-    repeat_for_opts(fun(Opts) -> ?MODULE:F(Opts) end, OptGenList);
-repeat_for_opts({F,Args}, OptGenList) when is_atom(F) ->
-    repeat_for_opts(fun(Opts) -> ?MODULE:F(Opts,Args) end, OptGenList);
-repeat_for_opts(F, OptGenList) ->
+repeat_for_opts(F, OptGenList) when is_function(F, 1) ->
     repeat_for_opts(F, OptGenList, []).
 
 repeat_for_opts(F, [], Acc) ->
diff --git a/lib/stdlib/test/ets_tough_SUITE.erl b/lib/stdlib/test/ets_tough_SUITE.erl
index 49aba7a529..0abce3200f 100644
--- a/lib/stdlib/test/ets_tough_SUITE.erl
+++ b/lib/stdlib/test/ets_tough_SUITE.erl
@@ -19,10 +19,15 @@
 %%
 -module(ets_tough_SUITE).
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,ex1/1]).
--export([init/1,terminate/2,handle_call/3,handle_info/2]).
+	 init_per_group/2,end_per_group/2,
+         ex1/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
--compile([export_all]).
+
+%% gen_server behavior.
+-behavior(gen_server).
+-export([init/1,terminate/2,handle_call/3,handle_cast/2,
+         handle_info/2,code_change/3]).
+
 -include_lib("common_test/include/ct.hrl").
 
 suite() ->
@@ -235,33 +240,6 @@ random_element(T) ->
     I = rand:uniform(tuple_size(T)),
     element(I,T).
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-show_table(N) ->
-    FileName = ["etsdump.",integer_to_list(N)],
-    case file:open(FileName,read) of
-	{ok,Fd} ->
-	    show_entries(Fd);
-	_ ->
-	    error
-    end.
-
-show_entries(Fd) ->
-    case phys_read_len(Fd) of
-	{ok,Len} ->
-	    case phys_read_entry(Fd,Len) of
-		{ok,ok} ->
-		    ok;
-		{ok,{Key,Val}} ->
-		    io:format("~w\n",[{Key,Val}]),
-		    show_entries(Fd);
-		_ ->
-		    error
-	    end;
-	_ ->
-	    error
-    end.
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -378,20 +356,6 @@ dget_class(ServerPid,Class,Condition) ->
 derase_class(ServerPid,Class) ->
     gen_server:call(ServerPid,{handle_delete_class,Class}, infinity).
 
-%%% dmodify(ServerPid,Application) -> ok
-%%%
-%%% Applies a function on every instance in the database.
-%%% The user provided function must always return one of the
-%%% terms {ok,NewItem}, true, or false.
-%%% Aug 96, this is only used to reset all timestamp values
-%%% in the database.
-%%% The function is supplied as Application = {Mod, Fun, ExtraArgs},
-%%% where the instance will be prepended to ExtraArgs before each
-%%% call is made.
-
-dmodify(ServerPid,Application) ->
-    gen_server:call(ServerPid,{handle_dmodify,Application}, infinity).
-
 %%% ddump_first(ServerPid,DumpDir) -> {dump_more,Ticket} | already_dumping
 %%%
 %%% Starts dumping the database. This call redirects all database updates
@@ -643,9 +607,15 @@ handle_call(stop,_From,Admin) ->
     ?ets_delete(Admin), % Make sure table is gone before reply is sent.
     {stop, normal, ok, []}.
 
+handle_cast(_Req, Admin) ->
+    {noreply, Admin}.
+
 handle_info({'EXIT',_Pid,_Reason},Admin) ->
     {stop,normal,Admin}.
 
+code_change(_OldVsn, StateData, _Extra) ->
+    {ok, StateData}.
+
 handle_delete(Class, Key, Admin) ->
     handle_call({handle_delete,Class,Key},from,Admin).
 
diff --git a/lib/stdlib/test/lists_SUITE.erl b/lib/stdlib/test/lists_SUITE.erl
index 531e97e8d6..5f2d8f0f4e 100644
--- a/lib/stdlib/test/lists_SUITE.erl
+++ b/lib/stdlib/test/lists_SUITE.erl
@@ -121,7 +121,7 @@ groups() ->
      {zip, [parallel], [zip_unzip, zip_unzip3, zipwith, zipwith3]},
      {misc, [parallel], [reverse, member, dropwhile, takewhile,
 			 filter_partition, suffix, subtract, join,
-			 hof]}
+			 hof, droplast]}
     ].
 
 init_per_suite(Config) ->
diff --git a/lib/stdlib/test/random_iolist.erl b/lib/stdlib/test/random_iolist.erl
index 555f063e0a..b62cf5b82b 100644
--- a/lib/stdlib/test/random_iolist.erl
+++ b/lib/stdlib/test/random_iolist.erl
@@ -24,17 +24,13 @@
 
 -module(random_iolist).
 
--export([run/3, run2/3, standard_seed/0, compare/3, compare2/3, 
+-export([run/3, standard_seed/0, compare/3,
 	 random_iolist/1]).
 
 run(Iter,Fun1,Fun2) ->
     standard_seed(),
     compare(Iter,Fun1,Fun2).
 
-run2(Iter,Fun1,Fun2) ->
-    standard_seed(),
-    compare2(Iter,Fun1,Fun2).
-
 random_byte() ->
      rand:uniform(256) - 1.
 
@@ -150,16 +146,6 @@ do_comp(List,F1,F2) ->
 	_ ->
 	    true
     end.
-	
-do_comp(List,List2,F1,F2) ->
-    X = F1(List,List2),
-    Y = F2(List,List2),
-    case X =:= Y of
-	false ->
-	    exit({not_matching,List,List2,X,Y});
-	_ ->
-	    true
-    end.
 
 compare(0,Fun1,Fun2) ->
     do_comp(<<>>,Fun1,Fun2),
@@ -172,25 +158,3 @@ compare(N,Fun1,Fun2) ->
     L = random_iolist(N),
     do_comp(L,Fun1,Fun2),
     compare(N-1,Fun1,Fun2).
-
-compare2(0,Fun1,Fun2) ->
-    L = random_iolist(100),
-    do_comp(<<>>,L,Fun1,Fun2),
-    do_comp(L,<<>>,Fun1,Fun2),
-    do_comp(<<>>,<<>>,Fun1,Fun2),
-    do_comp([],L,Fun1,Fun2),
-    do_comp(L,[],Fun1,Fun2),
-    do_comp([],[],Fun1,Fun2),
-    do_comp([[]|<<>>],L,Fun1,Fun2),
-    do_comp(L,[[]|<<>>],Fun1,Fun2),
-    do_comp([[]|<<>>],[[]|<<>>],Fun1,Fun2),
-    do_comp([<<>>,[]|<<>>],L,Fun1,Fun2),
-    do_comp(L,[<<>>,[]|<<>>],Fun1,Fun2),
-    do_comp([<<>>,[]|<<>>],[<<>>,[]|<<>>],Fun1,Fun2),
-    true;
-
-compare2(N,Fun1,Fun2) ->
-    L = random_iolist(N),
-    L2 = random_iolist(N),
-    do_comp(L,L2,Fun1,Fun2),
-    compare2(N-1,Fun1,Fun2).
diff --git a/lib/stdlib/test/random_unicode_list.erl b/lib/stdlib/test/random_unicode_list.erl
index 8db2fa8b56..2eeb28113d 100644
--- a/lib/stdlib/test/random_unicode_list.erl
+++ b/lib/stdlib/test/random_unicode_list.erl
@@ -24,7 +24,7 @@
 
 -module(random_unicode_list).
 
--export([run/3, run/4, run2/3, standard_seed/0, compare/4, compare2/3, 
+-export([run/3, run/4, standard_seed/0, compare/4,
 	 random_unicode_list/2]).
 
 run(I,F1,F2) ->
@@ -33,10 +33,6 @@ run(Iter,Fun1,Fun2,Enc) ->
     standard_seed(),
     compare(Iter,Fun1,Fun2,Enc).
 
-run2(Iter,Fun1,Fun2) ->
-    standard_seed(),
-    compare2(Iter,Fun1,Fun2).
-
 int_to_utf8(I) when I =< 16#7F ->
     <<I>>;
 int_to_utf8(I) when I =< 16#7FF ->
@@ -225,16 +221,6 @@ do_comp(List,F1,F2) ->
 	_ ->
 	    true
     end.
-	
-do_comp(List,List2,F1,F2) ->
-    X = F1(List,List2),
-    Y = F2(List,List2),
-    case X =:= Y of
-	false ->
-	    exit({not_matching,List,List2,X,Y});
-	_ ->
-	    true
-    end.
 
 compare(0,Fun1,Fun2,_Enc) ->
     do_comp(<<>>,Fun1,Fun2),
@@ -247,25 +233,3 @@ compare(N,Fun1,Fun2,Enc) ->
     L = random_unicode_list(N,Enc),
     do_comp(L,Fun1,Fun2),
     compare(N-1,Fun1,Fun2,Enc).
-
-compare2(0,Fun1,Fun2) ->
-    L = random_unicode_list(100,utf8),
-    do_comp(<<>>,L,Fun1,Fun2),
-    do_comp(L,<<>>,Fun1,Fun2),
-    do_comp(<<>>,<<>>,Fun1,Fun2),
-    do_comp([],L,Fun1,Fun2),
-    do_comp(L,[],Fun1,Fun2),
-    do_comp([],[],Fun1,Fun2),
-    do_comp([[]|<<>>],L,Fun1,Fun2),
-    do_comp(L,[[]|<<>>],Fun1,Fun2),
-    do_comp([[]|<<>>],[[]|<<>>],Fun1,Fun2),
-    do_comp([<<>>,[]|<<>>],L,Fun1,Fun2),
-    do_comp(L,[<<>>,[]|<<>>],Fun1,Fun2),
-    do_comp([<<>>,[]|<<>>],[<<>>,[]|<<>>],Fun1,Fun2),
-    true;
-
-compare2(N,Fun1,Fun2) ->
-    L = random_unicode_list(N,utf8),
-    L2 = random_unicode_list(N,utf8),
-    do_comp(L,L2,Fun1,Fun2),
-    compare2(N-1,Fun1,Fun2).
diff --git a/lib/stdlib/test/re_testoutput1_replacement_test.erl b/lib/stdlib/test/re_testoutput1_replacement_test.erl
index a40800d760..563e0001e4 100644
--- a/lib/stdlib/test/re_testoutput1_replacement_test.erl
+++ b/lib/stdlib/test/re_testoutput1_replacement_test.erl
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 %%
 -module(re_testoutput1_replacement_test).
--compile(export_all).
+-export([run/0]).
 -compile(no_native).
 %% This file is generated by running run_pcre_tests:gen_repl_test("re_SUITE_data/testoutput1")
 run() ->
diff --git a/lib/stdlib/test/re_testoutput1_split_test.erl b/lib/stdlib/test/re_testoutput1_split_test.erl
index 02987971fa..b39cb53a55 100644
--- a/lib/stdlib/test/re_testoutput1_split_test.erl
+++ b/lib/stdlib/test/re_testoutput1_split_test.erl
@@ -18,7 +18,7 @@
 %% %CopyrightEnd%
 %%
 -module(re_testoutput1_split_test).
--compile(export_all).
+-export([run/0]).
 -compile(no_native).
 %% This file is generated by running run_pcre_tests:gen_split_test("re_SUITE_data/testoutput1")
 join([]) -> [];
diff --git a/lib/stdlib/test/run_pcre_tests.erl b/lib/stdlib/test/run_pcre_tests.erl
index ae56db59d6..b62674d6e0 100644
--- a/lib/stdlib/test/run_pcre_tests.erl
+++ b/lib/stdlib/test/run_pcre_tests.erl
@@ -18,8 +18,7 @@
 %% %CopyrightEnd%
 %%
 -module(run_pcre_tests).
-
--compile(export_all).
+-export([test/1,gen_split_test/1,gen_repl_test/1]).
 
 test(RootDir) ->
     put(verbose,false),
@@ -119,49 +118,6 @@ test([{RE0,Line,Options0,Tests}|T],PreCompile,XMode,REAsList) ->
 	    end
     end.
 
-loopexec(_,_,X,Y,_,_) when X > Y ->
-    {match,[]};
-loopexec(P,Chal,X,Y,Unicode,Xopt) ->
-    case re:run(Chal,P,[{offset,X}]++Xopt) of
-	nomatch ->
-	    {match,[]};
-	{match,[{A,B}|More]} ->
-	    {match,Rest} = 
-		case B>0 of
-		    true ->
-			loopexec(P,Chal,A+B,Y,Unicode,Xopt);
-		    false ->
-			{match,M} = case re:run(Chal,P,[{offset,X},notempty,anchored]++Xopt) of
-				      nomatch ->
-					  {match,[]};
-				      {match,Other} ->
-					  {match,fixup(Chal,Other,0)}
-				  end,
-			NewA = forward(Chal,A,1,Unicode),
-			{match,MM} = loopexec(P,Chal,NewA,Y,Unicode,Xopt),
-			{match,M ++ MM}
-		end,
-	    {match,fixup(Chal,[{A,B}|More],0)++Rest}
-    end.
-
-forward(_Chal,A,0,_) ->
-    A;
-forward(_Chal,A,N,false) ->
-    A+N;
-forward(Chal,A,N,true) ->
-    <<_:A/binary,Tl/binary>> = Chal,
-    Forw = case Tl of
-	       <<1:1,1:1,0:1,_:5,_/binary>>  ->
-		   2;
-	       <<1:1,1:1,1:1,0:1,_:4,_/binary>>  ->
-		   3;
-	       <<1:1,1:1,1:1,1:1,0:1,_:3,_/binary>>  ->
-		   4;
-	       _ ->
-		   1
-	   end,
-    forward(Chal,A+Forw,N-1,true).
-    
 contains_eightbit(<<>>) ->
     false;
 contains_eightbit(<<X:8,_/binary>>) when X >= 128 ->
@@ -201,23 +157,6 @@ clean_duplicates([X|T],L) ->
     end.
 
 
-global_fixup(_,nomatch) ->
-    nomatch;
-global_fixup(P,{match,M}) ->
-    {match,lists:flatten(global_fixup2(P,M))}.
-
-global_fixup2(_,[]) ->
-    [];
-global_fixup2(P,[H|T]) ->
-    [gfixup_one(P,0,H)|global_fixup2(P,T)].
-
-gfixup_one(_,_,[]) ->
-    [];
-gfixup_one(P,I,[{Start,Len}|T]) ->
-    <<_:Start/binary,R:Len/binary,_/binary>> = P,
-    [{I,R}|gfixup_one(P,I+1,T)].
-
-
 press([]) ->
     [];
 press([H|T]) ->
@@ -981,7 +920,7 @@ gen_split_test(OneFile) ->
     ErlFileName = ErlModule++".erl",
     {ok,F}= file:open(ErlFileName,[write]),
     io:format(F,"-module(~s).~n",[ErlModule]),
-    io:format(F,"-compile(export_all).~n",[]),
+    io:format(F,"-export([run/0]).~n",[]),
     io:format(F,"-compile(no_native).~n",[]),
     io:format(F,"%% This file is generated by running ~w:gen_split_test(~p)~n",
 	      [?MODULE,OneFile]),
@@ -1024,7 +963,7 @@ dumponesplit(F,{RE,Line,O,TS}) ->
 			   "$x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; "
 			   "print \"    <<\\\"$x\\\">> = "
 			   "iolist_to_binary(join(re:split(\\\"~s\\\","
-			   "\\\"~s\\\",~p))), \\n\";'~n",
+			   "\\\"~s\\\",~p))),\\n\";'~n",
 			   [zsafe(safe(RE)),
 			    SSS,
 			    ysafe(safe(Str)),
@@ -1035,7 +974,7 @@ dumponesplit(F,{RE,Line,O,TS}) ->
 			   "$x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; "
 			   "print \"    <<\\\"$x\\\">> = "
 			   "iolist_to_binary(join(re:split(\\\"~s\\\","
-			   "\\\"~s\\\",~p))), \\n\";'~n",
+			   "\\\"~s\\\",~p))),\\n\";'~n",
 			   [zsafe(safe(RE)),
 			    SSS,
 			    ysafe(safe(Str)),
@@ -1046,7 +985,7 @@ dumponesplit(F,{RE,Line,O,TS}) ->
 			   "$x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; "
 			   "print \"    <<\\\"$x\\\">> = "
 			   "iolist_to_binary(join(re:split(\\\"~s\\\","
-			   "\\\"~s\\\",~p))), \\n\";'~n",
+			   "\\\"~s\\\",~p))),\\n\";'~n",
 			   [zsafe(safe(RE)),
 			    SSS,
 			    ysafe(safe(Str)),
@@ -1071,7 +1010,7 @@ gen_repl_test(OneFile) ->
     ErlFileName = ErlModule++".erl",
     {ok,F}= file:open(ErlFileName,[write]),
     io:format(F,"-module(~s).~n",[ErlModule]),
-    io:format(F,"-compile(export_all).~n",[]),
+    io:format(F,"-export([run/0]).~n",[]),
     io:format(F,"-compile(no_native).~n",[]),
     io:format(F,"%% This file is generated by running ~w:gen_repl_test(~p)~n",
 	      [?MODULE,OneFile]),