Fix formatting for kernel

36 files changed, 394 insertions, 376 deletions

diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index a46967e010..c139c0eefe 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -20,7 +20,9 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, failover/1, failover_comp/1, permissions/1, load/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 failover/1, failover_comp/1, permissions/1, load/1,
 	 load_use_cache/1,
 	 otp_1586/1, otp_2078/1, otp_2012/1, otp_2718/1, otp_2973/1,
 	 otp_3002/1, otp_3184/1, otp_4066/1, otp_4227/1, otp_5363/1,
@@ -44,19 +46,19 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[failover, failover_comp, permissions, load,
- load_use_cache, {group, reported_bugs}, start_phases,
- script_start, nodedown_start, permit_false_start_local,
- permit_false_start_dist, get_key,
- {group, distr_changed}, config_change, shutdown_func].
+    [failover, failover_comp, permissions, load,
+     load_use_cache, {group, reported_bugs}, start_phases,
+     script_start, nodedown_start, permit_false_start_local,
+     permit_false_start_dist, get_key,
+     {group, distr_changed}, config_change, shutdown_func].
 
 groups() -> 
     [{reported_bugs, [],
-  [otp_1586, otp_2078, otp_2012, otp_2718, otp_2973,
-   otp_3002, otp_3184, otp_4066, otp_4227, otp_5363,
-   otp_5606]},
- {distr_changed, [],
-  [distr_changed_tc1, distr_changed_tc2]}].
+      [otp_1586, otp_2078, otp_2012, otp_2718, otp_2973,
+       otp_3002, otp_3184, otp_4066, otp_4227, otp_5363,
+       otp_5606]},
+     {distr_changed, [],
+      [distr_changed_tc1, distr_changed_tc2]}].
 
 init_per_suite(Config) ->
     Config.
@@ -65,10 +67,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 
diff --git a/lib/kernel/test/bif_SUITE.erl b/lib/kernel/test/bif_SUITE.erl
index ddb6866179..980d162f55 100644
--- a/lib/kernel/test/bif_SUITE.erl
+++ b/lib/kernel/test/bif_SUITE.erl
@@ -17,7 +17,8 @@
 %% %CopyrightEnd%
 %%
 -module(bif_SUITE).
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([ 
 	 spawn1/1, spawn2/1, spawn3/1, spawn4/1,
@@ -51,15 +52,15 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[{group, spawn_tests}, {group, spawn_link_tests},
- {group, spawn_opt_tests}, spawn_failures, wilderness].
+    [{group, spawn_tests}, {group, spawn_link_tests},
+     {group, spawn_opt_tests}, spawn_failures, wilderness].
 
 groups() -> 
     [{spawn_tests, [], [spawn1, spawn2, spawn3, spawn4]},
- {spawn_link_tests, [],
-  [spawn_link1, spawn_link2, spawn_link3, spawn_link4]},
- {spawn_opt_tests, [],
-  [spawn_opt2, spawn_opt3, spawn_opt4, spawn_opt5]}].
+     {spawn_link_tests, [],
+      [spawn_link1, spawn_link2, spawn_link3, spawn_link4]},
+     {spawn_opt_tests, [],
+      [spawn_opt2, spawn_opt3, spawn_opt4, spawn_opt5]}].
 
 init_per_suite(Config) ->
     Config.
@@ -68,13 +69,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
-
-
-
+    Config.
 
 
 spawn1(doc) -> ["Test spawn/1"];
diff --git a/lib/kernel/test/cleanup.erl b/lib/kernel/test/cleanup.erl
index 7fb00b4305..01db1e9124 100644
--- a/lib/kernel/test/cleanup.erl
+++ b/lib/kernel/test/cleanup.erl
@@ -23,16 +23,16 @@
 -include_lib("test_server/include/test_server.hrl").
 
 all() -> 
-[cleanup].
+    [cleanup].
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 cleanup(suite) -> [];
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index 90b8a6a0d6..64c2878f9e 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -87,9 +87,10 @@ init_per_testcase(_Func, Config) ->
     P=code:get_path(),
     [{watchdog, Dog}, {code_path, P}|Config].
 
-end_per_testcase(mult_lib_roots, Config) ->
+end_per_testcase(TC, Config) when TC == mult_lib_roots; 
+				  TC == big_boot_embedded ->
     {ok, HostName} = inet:gethostname(),
-    NodeName = list_to_atom("mult_lib_roots@"++HostName),
+    NodeName = list_to_atom(atom_to_list(TC)++"@"++HostName),
     ?t:stop_node(NodeName),
     end_per_testcase(Config);
 end_per_testcase(_Func, Config) ->
diff --git a/lib/kernel/test/disk_log_SUITE.erl b/lib/kernel/test/disk_log_SUITE.erl
index 40a7edb363..b5faf984ff 100644
--- a/lib/kernel/test/disk_log_SUITE.erl
+++ b/lib/kernel/test/disk_log_SUITE.erl
@@ -34,7 +34,8 @@
 -define(datadir(Conf), ?config(data_dir, Conf)).
 -endif.
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, 
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
 
 	 halt_int_inf/1, 
 	 halt_int_sz_1/1, halt_int_sz_2/1,
@@ -145,43 +146,43 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[{group, halt_int}, {group, wrap_int},
- {group, halt_ext}, {group, wrap_ext},
- {group, read_mode}, {group, head}, {group, notif},
- new_idx_vsn, reopen, {group, block}, unblock,
- {group, open}, {group, close}, {group, error}, chunk,
- truncate, many_users, {group, info},
- {group, change_size}, change_attribute,
- {group, distribution}, evil, otp_6278].
+    [{group, halt_int}, {group, wrap_int},
+     {group, halt_ext}, {group, wrap_ext},
+     {group, read_mode}, {group, head}, {group, notif},
+     new_idx_vsn, reopen, {group, block}, unblock,
+     {group, open}, {group, close}, {group, error}, chunk,
+     truncate, many_users, {group, info},
+     {group, change_size}, change_attribute,
+     {group, distribution}, evil, otp_6278].
 
 groups() -> 
     [{halt_int, [], [halt_int_inf, {group, halt_int_sz}]},
- {halt_int_sz, [], [halt_int_sz_1, halt_int_sz_2]},
- {read_mode, [],
-  [halt_int_ro, halt_ext_ro, wrap_int_ro, wrap_ext_ro,
-   halt_trunc, halt_misc, halt_ro_alog, halt_ro_balog,
-   halt_ro_crash]},
- {wrap_int, [], [wrap_int_1, wrap_int_2, inc_wrap_file]},
- {halt_ext, [], [halt_ext_inf, {group, halt_ext_sz}]},
- {halt_ext_sz, [], [halt_ext_sz_1, halt_ext_sz_2]},
- {wrap_ext, [], [wrap_ext_1, wrap_ext_2]},
- {head, [], [head_func, plain_head, one_header]},
- {notif, [],
-  [wrap_notif, full_notif, trunc_notif, blocked_notif]},
- {block, [], [block_blocked, block_queue, block_queue2]},
- {open, [],
-  [open_overwrite, open_size, open_truncate, open_error]},
- {close, [], [close_race, close_block, close_deadlock]},
- {error, [], [error_repair, error_log, error_index]},
- {info, [], [info_current]},
- {change_size, [],
-  [change_size_before, change_size_during,
-   change_size_after, default_size, change_size2,
-   change_size_truncate]},
- {distribution, [],
-  [dist_open, dist_error_open, dist_notify,
-   dist_terminate, dist_accessible, dist_deadlock,
-   dist_open2, other_groups]}].
+     {halt_int_sz, [], [halt_int_sz_1, halt_int_sz_2]},
+     {read_mode, [],
+      [halt_int_ro, halt_ext_ro, wrap_int_ro, wrap_ext_ro,
+       halt_trunc, halt_misc, halt_ro_alog, halt_ro_balog,
+       halt_ro_crash]},
+     {wrap_int, [], [wrap_int_1, wrap_int_2, inc_wrap_file]},
+     {halt_ext, [], [halt_ext_inf, {group, halt_ext_sz}]},
+     {halt_ext_sz, [], [halt_ext_sz_1, halt_ext_sz_2]},
+     {wrap_ext, [], [wrap_ext_1, wrap_ext_2]},
+     {head, [], [head_func, plain_head, one_header]},
+     {notif, [],
+      [wrap_notif, full_notif, trunc_notif, blocked_notif]},
+     {block, [], [block_blocked, block_queue, block_queue2]},
+     {open, [],
+      [open_overwrite, open_size, open_truncate, open_error]},
+     {close, [], [close_race, close_block, close_deadlock]},
+     {error, [], [error_repair, error_log, error_index]},
+     {info, [], [info_current]},
+     {change_size, [],
+      [change_size_before, change_size_during,
+       change_size_after, default_size, change_size2,
+       change_size_truncate]},
+     {distribution, [],
+      [dist_open, dist_error_open, dist_notify,
+       dist_terminate, dist_accessible, dist_deadlock,
+       dist_open2, other_groups]}].
 
 init_per_suite(Config) ->
     Config.
@@ -190,10 +191,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 
diff --git a/lib/kernel/test/erl_boot_server_SUITE.erl b/lib/kernel/test/erl_boot_server_SUITE.erl
index 775f1b1e47..ad71e0c1bd 100644
--- a/lib/kernel/test/erl_boot_server_SUITE.erl
+++ b/lib/kernel/test/erl_boot_server_SUITE.erl
@@ -36,7 +36,7 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[start, start_link, stop, add, delete, responses].
+    [start, start_link, stop, add, delete, responses].
 
 groups() -> 
     [].
@@ -48,10 +48,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 -define(all_ones, {255, 255, 255, 255}).
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index 09b5eecc4c..4933137650 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -21,7 +21,8 @@
 %-define(line_trace, 1).
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([tick/1, tick_change/1, illegal_nodenames/1, hidden_node/1,
 	 table_waste/1, net_setuptime/1,
@@ -60,17 +61,17 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[tick, tick_change, illegal_nodenames, hidden_node,
- table_waste, net_setuptime, {group, monitor_nodes}].
+    [tick, tick_change, illegal_nodenames, hidden_node,
+     table_waste, net_setuptime, {group, monitor_nodes}].
 
 groups() -> 
     [{monitor_nodes, [],
-  [monitor_nodes_nodedown_reason,
-   monitor_nodes_complex_nodedown_reason,
-   monitor_nodes_node_type, monitor_nodes_misc,
-   monitor_nodes_otp_6481, monitor_nodes_errors,
-   monitor_nodes_combinations, monitor_nodes_cleanup,
-   monitor_nodes_many]}].
+      [monitor_nodes_nodedown_reason,
+       monitor_nodes_complex_nodedown_reason,
+       monitor_nodes_node_type, monitor_nodes_misc,
+       monitor_nodes_otp_6481, monitor_nodes_errors,
+       monitor_nodes_combinations, monitor_nodes_cleanup,
+       monitor_nodes_many]}].
 
 init_per_suite(Config) ->
     Config.
@@ -79,10 +80,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
diff --git a/lib/kernel/test/erl_distribution_wb_SUITE.erl b/lib/kernel/test/erl_distribution_wb_SUITE.erl
index 5b1dc78245..f61a8fe2cc 100644
--- a/lib/kernel/test/erl_distribution_wb_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_wb_SUITE.erl
@@ -21,7 +21,8 @@
 -include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/inet.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([init_per_testcase/2, end_per_testcase/2, whitebox/1, 
 	 switch_options/1, missing_compulsory_dflags/1]).
@@ -80,7 +81,7 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[whitebox, switch_options, missing_compulsory_dflags].
+    [whitebox, switch_options, missing_compulsory_dflags].
 
 groups() -> 
     [].
@@ -92,10 +93,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index ba2b369ec2..e429986ca9 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -21,7 +21,8 @@
 -include_lib("kernel/include/file.hrl").
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([get_path/1, set_path/1, get_file/1,
 	 inet_existing/1, inet_coming_up/1, inet_disconnects/1,
@@ -38,10 +39,10 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[get_path, set_path, get_file, inet_existing,
- inet_coming_up, inet_disconnects, multiple_slaves,
- file_requests, local_archive, remote_archive,
- primary_archive, virtual_dir_in_archive].
+    [get_path, set_path, get_file, inet_existing,
+     inet_coming_up, inet_disconnects, multiple_slaves,
+     file_requests, local_archive, remote_archive,
+     primary_archive, virtual_dir_in_archive].
 
 groups() -> 
     [].
@@ -53,10 +54,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
diff --git a/lib/kernel/test/error_logger_SUITE.erl b/lib/kernel/test/error_logger_SUITE.erl
index 93b23c38b3..57d7f07ebc 100644
--- a/lib/kernel/test/error_logger_SUITE.erl
+++ b/lib/kernel/test/error_logger_SUITE.erl
@@ -27,7 +27,9 @@
 %% error_logger deliver the expected events.
 %%-----------------------------------------------------------------
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, error_report/1, info_report/1, error/1, info/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 error_report/1, info_report/1, error/1, info/1,
 	 emulator/1, tty/1, logfile/1, add/1, delete/1]).
 
 -export([generate_error/0]).
@@ -40,8 +42,8 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[error_report, info_report, error, info, emulator, tty,
- logfile, add, delete].
+    [error_report, info_report, error, info, emulator, tty,
+     logfile, add, delete].
 
 groups() -> 
     [].
@@ -53,10 +55,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %%-----------------------------------------------------------------
diff --git a/lib/kernel/test/error_logger_warn_SUITE.erl b/lib/kernel/test/error_logger_warn_SUITE.erl
index 59139ba38b..3e76355dfd 100644
--- a/lib/kernel/test/error_logger_warn_SUITE.erl
+++ b/lib/kernel/test/error_logger_warn_SUITE.erl
@@ -18,7 +18,9 @@
 %%
 -module(error_logger_warn_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2,
 	 basic/1,warnings_info/1,warnings_warnings/1,
 	 rb_basic/1,rb_warnings_info/1,rb_warnings_warnings/1,
 	 rb_trunc/1,rb_utc/1,file_utc/1]).
@@ -46,9 +48,9 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[basic, warnings_info, warnings_warnings, rb_basic,
- rb_warnings_info, rb_warnings_warnings, rb_trunc,
- rb_utc, file_utc].
+    [basic, warnings_info, warnings_warnings, rb_basic,
+     rb_warnings_info, rb_warnings_warnings, rb_trunc,
+     rb_utc, file_utc].
 
 groups() -> 
     [].
@@ -60,10 +62,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Case, Config) ->
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index 8b0470bad4..0e84cae7ca 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -40,8 +40,8 @@
 
 -module(?FILE_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,
-	 init/1, fini/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2, end_per_testcase/2,
 	 read_write_file/1, names/1]).
 -export([cur_dir_0/1, cur_dir_1/1, make_del_dir/1,
@@ -101,54 +101,48 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[altname, read_write_file, {group, dirs},
- {group, files}, delete, rename, names, {group, errors},
- {group, compression}, {group, links}, copy,
- delayed_write, read_ahead, segment_read, segment_write,
- ipread, pid2name, interleaved_read_write, otp_5814,
- large_file, read_line_1, read_line_2, read_line_3,
- read_line_4, standard_io].
+    [altname, read_write_file, {group, dirs},
+     {group, files}, delete, rename, names, {group, errors},
+     {group, compression}, {group, links}, copy,
+     delayed_write, read_ahead, segment_read, segment_write,
+     ipread, pid2name, interleaved_read_write, otp_5814,
+     large_file, read_line_1, read_line_2, read_line_3,
+     read_line_4, standard_io].
 
 groups() -> 
     [{dirs, [], [make_del_dir, cur_dir_0, cur_dir_1]},
- {files, [],
-  [{group, open}, {group, pos}, {group, file_info},
-   {group, consult}, {group, eval}, {group, script},
-   truncate, sync, datasync, advise]},
- {open, [],
-  [open1, old_modes, new_modes, path_open, close, access,
-   read_write, pread_write, append, open_errors,
-   exclusive]},
- {pos, [], [pos1, pos2]},
- {file_info, [],
-  [file_info_basic_file, file_info_basic_directory,
-   file_info_bad, file_info_times, file_write_file_info]},
- {consult, [], [consult1, path_consult]},
- {eval, [], [eval1, path_eval]},
- {script, [], [script1, path_script]},
- {errors, [],
-  [e_delete, e_rename, e_make_dir, e_del_dir]},
- {compression, [],
-  [read_compressed_cooked, read_compressed_cooked_binary,
-   read_cooked_tar_problem, read_not_really_compressed,
-   write_compressed, compress_errors, catenated_gzips]},
- {links, [],
-  [make_link, read_link_info_for_non_link, symlinks]}].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
+     {files, [],
+      [{group, open}, {group, pos}, {group, file_info},
+       {group, consult}, {group, eval}, {group, script},
+       truncate, sync, datasync, advise]},
+     {open, [],
+      [open1, old_modes, new_modes, path_open, close, access,
+       read_write, pread_write, append, open_errors,
+       exclusive]},
+     {pos, [], [pos1, pos2]},
+     {file_info, [],
+      [file_info_basic_file, file_info_basic_directory,
+       file_info_bad, file_info_times, file_write_file_info]},
+     {consult, [], [consult1, path_consult]},
+     {eval, [], [eval1, path_eval]},
+     {script, [], [script1, path_script]},
+     {errors, [],
+      [e_delete, e_rename, e_make_dir, e_del_dir]},
+     {compression, [],
+      [read_compressed_cooked, read_compressed_cooked_binary,
+       read_cooked_tar_problem, read_not_really_compressed,
+       write_compressed, compress_errors, catenated_gzips]},
+     {links, [],
+      [make_link, read_link_info_for_non_link, symlinks]}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
-init(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
 	    Priv = ?config(priv_dir, Config),
@@ -165,7 +159,7 @@ init(Config) when is_list(Config) ->
 	    ?FILE_INIT(Config)
     end.
 
-fini(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
 	    os:cmd("subst z: /d");
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index 23cf136b4e..20b0d46d56 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -35,9 +35,9 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[basic, api_open_close, api_listen, api_connect_init,
- api_opts, xfer_min, xfer_active, def_sndrcvinfo,
- implicit_inet6].
+    [basic, api_open_close, api_listen, api_connect_init,
+     api_opts, xfer_min, xfer_active, def_sndrcvinfo,
+     implicit_inet6].
 
 groups() -> 
     [].
@@ -60,10 +60,10 @@ end_per_suite(_Conifig) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Func, Config) ->
diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index e7dc0edd17..6fcc2bed40 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -25,7 +25,9 @@
 -include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/inet.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 init_per_testcase/2, end_per_testcase/2,
 	 t_connect_timeout/1, t_accept_timeout/1,
 	 t_connect_bad/1,
 	 t_recv_timeout/1, t_recv_eof/1,
@@ -35,14 +37,14 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[{group, t_accept}, {group, t_connect}, {group, t_recv},
- t_shutdown_write, t_shutdown_both, t_shutdown_error,
- t_fdopen, t_implicit_inet6].
+    [{group, t_accept}, {group, t_connect}, {group, t_recv},
+     t_shutdown_write, t_shutdown_both, t_shutdown_error,
+     t_fdopen, t_implicit_inet6].
 
 groups() -> 
     [{t_accept, [], [t_accept_timeout]},
- {t_connect, [], [t_connect_timeout, t_connect_bad]},
- {t_recv, [], [t_recv_timeout, t_recv_eof]}].
+     {t_connect, [], [t_connect_timeout, t_connect_bad]},
+     {t_recv, [], [t_recv_timeout, t_recv_eof]}].
 
 init_per_suite(Config) ->
     Config.
@@ -51,10 +53,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Func, Config) ->
diff --git a/lib/kernel/test/gen_tcp_echo_SUITE.erl b/lib/kernel/test/gen_tcp_echo_SUITE.erl
index ead976b94a..bebd4fa880 100644
--- a/lib/kernel/test/gen_tcp_echo_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_echo_SUITE.erl
@@ -22,7 +22,9 @@
 
 %%-compile(export_all).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 init_per_testcase/2, end_per_testcase/2,
 	 active_echo/1, passive_echo/1, active_once_echo/1,
 	 slow_active_echo/1, slow_passive_echo/1,
 	 limit_active_echo/1, limit_passive_echo/1,
@@ -34,10 +36,10 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[active_echo, passive_echo, active_once_echo,
- slow_active_echo, slow_passive_echo, limit_active_echo,
- limit_passive_echo, large_limit_active_echo,
- large_limit_passive_echo].
+    [active_echo, passive_echo, active_once_echo,
+     slow_active_echo, slow_passive_echo, limit_active_echo,
+     limit_passive_echo, large_limit_active_echo,
+     large_limit_passive_echo].
 
 groups() -> 
     [].
@@ -49,10 +51,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Func, Config) ->
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index b2a8a309ed..bd554ba486 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -22,7 +22,9 @@
 
 %-compile(export_all).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, controlling_process/1, no_accept/1, close_with_pending_output/1,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 controlling_process/1, no_accept/1, close_with_pending_output/1,
 	 data_before_close/1, iter_max_socks/1, get_status/1,
 	 passive_sockets/1, accept_closed_by_other_process/1,
 	 init_per_testcase/2, end_per_testcase/2,
@@ -34,14 +36,15 @@
 	 partial_recv_and_close_2/1,partial_recv_and_close_3/1,so_priority/1,
 	 % Accept tests
 	 primitive_accept/1,multi_accept_close_listen/1,accept_timeout/1,
-	 accept_timeouts_in_order/1,accept_timeouts_in_order2/1,accept_timeouts_in_order3/1,
-	 accept_timeouts_mixed/1, 
+	 accept_timeouts_in_order/1,accept_timeouts_in_order2/1,
+	 accept_timeouts_in_order3/1,accept_timeouts_mixed/1, 
 	 killing_acceptor/1,killing_multi_acceptors/1,killing_multi_acceptors2/1,
-	 several_accepts_in_one_go/1,active_once_closed/1, send_timeout/1, otp_7731/1,
-	 zombie_sockets/1, otp_7816/1, otp_8102/1]).
+	 several_accepts_in_one_go/1,active_once_closed/1, send_timeout/1, 
+	 otp_7731/1, zombie_sockets/1, otp_7816/1, otp_8102/1]).
 
 %% Internal exports.
--export([sender/3, not_owner/1, passive_sockets_server/2, priority_server/1, otp_7731_server/1, zombie_server/2]).
+-export([sender/3, not_owner/1, passive_sockets_server/2, priority_server/1, 
+	 otp_7731_server/1, zombie_server/2]).
 
 init_per_testcase(_Func, Config) when is_list(Config) ->
     Dog = test_server:timetrap(test_server:seconds(240)),
@@ -53,23 +56,23 @@ end_per_testcase(_Func, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[controlling_process, no_accept,
- close_with_pending_output, data_before_close,
- iter_max_socks, passive_sockets,
- accept_closed_by_other_process, otp_3924, closed_socket,
- shutdown_active, shutdown_passive, shutdown_pending,
- default_options, http_bad_packet, busy_send,
- busy_disconnect_passive, busy_disconnect_active,
- fill_sendq, partial_recv_and_close,
- partial_recv_and_close_2, partial_recv_and_close_3,
- so_priority, primitive_accept,
- multi_accept_close_listen, accept_timeout,
- accept_timeouts_in_order, accept_timeouts_in_order2,
- accept_timeouts_in_order3, accept_timeouts_mixed,
- killing_acceptor, killing_multi_acceptors,
- killing_multi_acceptors2, several_accepts_in_one_go,
- active_once_closed, send_timeout, otp_7731,
- zombie_sockets, otp_7816, otp_8102].
+    [controlling_process, no_accept,
+     close_with_pending_output, data_before_close,
+     iter_max_socks, passive_sockets,
+     accept_closed_by_other_process, otp_3924, closed_socket,
+     shutdown_active, shutdown_passive, shutdown_pending,
+     default_options, http_bad_packet, busy_send,
+     busy_disconnect_passive, busy_disconnect_active,
+     fill_sendq, partial_recv_and_close,
+     partial_recv_and_close_2, partial_recv_and_close_3,
+     so_priority, primitive_accept,
+     multi_accept_close_listen, accept_timeout,
+     accept_timeouts_in_order, accept_timeouts_in_order2,
+     accept_timeouts_in_order3, accept_timeouts_mixed,
+     killing_acceptor, killing_multi_acceptors,
+     killing_multi_acceptors2, several_accepts_in_one_go,
+     active_once_closed, send_timeout, otp_7731,
+     zombie_sockets, otp_7816, otp_8102].
 
 groups() -> 
     [].
@@ -81,10 +84,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index 266876d3d7..50f8d55630 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -29,7 +29,8 @@
 % XXX - we should pick a port that we _know_ is closed. That's pretty hard.
 -define(CLOSED_PORT, 6666).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 -export([send_to_closed/1, 
@@ -39,9 +40,9 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[send_to_closed, buffer_size, binary_passive_recv,
- bad_address, read_packets, open_fd, connect,
- implicit_inet6].
+    [send_to_closed, buffer_size, binary_passive_recv,
+     bad_address, read_packets, open_fd, connect,
+     implicit_inet6].
 
 groups() -> 
     [].
@@ -53,10 +54,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Case, Config) ->
diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl
index bb1ea83239..8540897d5b 100644
--- a/lib/kernel/test/global_SUITE.erl
+++ b/lib/kernel/test/global_SUITE.erl
@@ -63,26 +63,26 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-case init:get_argument(ring_line) of
-  {ok, _} -> [ring_line];
-  _ ->
-      [names, names_hidden, locks, locks_hidden, bad_input,
-       names_and_locks, lock_die, name_die, basic_partition,
-       advanced_partition, basic_name_partition,
-       stress_partition, simple_ring, simple_line, ring, line,
-       global_lost_nodes, otp_1849, otp_3162, otp_5640,
-       otp_5737, otp_6931, simple_disconnect, simple_resolve,
-       simple_resolve2, simple_resolve3, leftover_name,
-       re_register_name, name_exit, external_nodes, many_nodes,
-       sync_0, global_groups_change, register_1, both_known_1,
-       lost_unregister, mass_death, garbage_messages]
-end.
+    case init:get_argument(ring_line) of
+	{ok, _} -> [ring_line];
+	_ ->
+	    [names, names_hidden, locks, locks_hidden, bad_input,
+	     names_and_locks, lock_die, name_die, basic_partition,
+	     advanced_partition, basic_name_partition,
+	     stress_partition, simple_ring, simple_line, ring, line,
+	     global_lost_nodes, otp_1849, otp_3162, otp_5640,
+	     otp_5737, otp_6931, simple_disconnect, simple_resolve,
+	     simple_resolve2, simple_resolve3, leftover_name,
+	     re_register_name, name_exit, external_nodes, many_nodes,
+	     sync_0, global_groups_change, register_1, both_known_1,
+	     lost_unregister, mass_death, garbage_messages]
+    end.
 
 groups() -> 
     [{ttt, [],
-  [names, names_hidden, locks, locks_hidden, bad_input,
-   names_and_locks, lock_die, name_die, basic_partition,
-   ring]}].
+      [names, names_hidden, locks, locks_hidden, bad_input,
+       names_and_locks, lock_die, name_die, basic_partition,
+       ring]}].
 
 init_per_group(_GroupName, Config) ->
 	Config.
diff --git a/lib/kernel/test/global_group_SUITE.erl b/lib/kernel/test/global_group_SUITE.erl
index 651ca08c41..859d0618e7 100644
--- a/lib/kernel/test/global_group_SUITE.erl
+++ b/lib/kernel/test/global_group_SUITE.erl
@@ -38,8 +38,8 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[start_gg_proc, no_gg_proc, no_gg_proc_sync, compatible,
- one_grp, one_grp_x, two_grp, test_exit, hidden_groups].
+    [start_gg_proc, no_gg_proc, no_gg_proc_sync, compatible,
+     one_grp, one_grp_x, two_grp, test_exit, hidden_groups].
 
 groups() -> 
     [].
@@ -200,8 +200,8 @@ no_gg_proc(Config) when is_list(Config) ->
     ?line Own_nodes_should = [node(), Cp1nn, Cp2nn, Cp3nn, 
 			      Cpxnn, Cpynn, Cpznn],
     ?line Own_nodes = rpc:call(Cp3, global_group, own_nodes, []), 
-    ?line true = (Own_nodes -- Own_nodes_should) =:= [],
-    ?line true = (Own_nodes_should -- Own_nodes) =:= [],
+    ?line [] = (Own_nodes -- Own_nodes_should),
+    ?line [] = (Own_nodes_should -- Own_nodes),
     
     ?line Pid2 = rpc:call(Cp1, global_group, send, [test2, {ping, self()}]),
     ?line receive
@@ -375,8 +375,8 @@ no_gg_proc_sync(Config) when is_list(Config) ->
     ?line Own_nodes_should = [node(), Cp1nn, Cp2nn, Cp3nn, 
 			      Cpxnn, Cpynn, Cpznn],
     ?line Own_nodes = rpc:call(Cp3, global_group, own_nodes, []), 
-    ?line true = (Own_nodes -- Own_nodes_should) =:= [],
-    ?line true = (Own_nodes_should -- Own_nodes) =:= [],
+    ?line [] = (Own_nodes -- Own_nodes_should),
+    ?line [] = (Own_nodes_should -- Own_nodes),
     
     ?line Pid2 = rpc:call(Cp1, global_group, send, [test2, {ping, self()}]),
     ?line receive
@@ -549,8 +549,8 @@ compatible(Config) when is_list(Config) ->
     ?line Own_nodes_should = [node(), Cp1nn, Cp2nn, Cp3nn, 
 			      Cpxnn, Cpynn, Cpznn],
     ?line Own_nodes = rpc:call(Cp3, global_group, own_nodes, []), 
-    ?line true = (Own_nodes -- Own_nodes_should) =:= [],
-    ?line true = (Own_nodes_should -- Own_nodes) =:= [],
+    ?line [] = (Own_nodes -- Own_nodes_should),
+    ?line [] = (Own_nodes_should -- Own_nodes),
     
     ?line Pid2 = rpc:call(Cp1, global_group, send, [test2, {ping, self()}]),
     ?line receive
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index e38d6df7c1..24e05b011a 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -20,8 +20,10 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, ostype/1, start/1, restart/1, reboot/1, set_cmd/1, clear_cmd/1,
-	dont_drop/1, kill_pid/1, fini/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, start/1, restart/1, 
+	 reboot/1, set_cmd/1, clear_cmd/1,
+	 dont_drop/1, kill_pid/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -56,32 +58,26 @@ end_per_testcase(_Func, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[start, restart, reboot, set_cmd, clear_cmd, kill_pid].
+    [start, restart, reboot, set_cmd, clear_cmd, kill_pid].
 
 groups() -> 
     [].
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
-ostype(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
     case os:type() of
 	{win32, windows} ->
 	    {skipped, "No use to run on Windows 95/98"};
 	_ ->
 	    Config
     end.
-fini(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     Config.
 
 start_check(Type, Name) ->
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 4d673e0814..d4dd98dd1e 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -22,7 +22,8 @@
 -include_lib("kernel/include/inet.hrl").
 -include_lib("kernel/src/inet_dns.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 t_gethostbyaddr/0, t_gethostbyaddr/1,
 	 t_getaddr/0, t_getaddr/1,
 	 t_gethostbyname/0, t_gethostbyname/1,
@@ -79,10 +80,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 init_per_testcase(_Func, Config) ->
     Dog = test_server:timetrap(test_server:seconds(60)),
diff --git a/lib/kernel/test/inet_res_SUITE.erl b/lib/kernel/test/inet_res_SUITE.erl
index a3daf8d053..1e5a62216f 100644
--- a/lib/kernel/test/inet_res_SUITE.erl
+++ b/lib/kernel/test/inet_res_SUITE.erl
@@ -24,7 +24,8 @@
 -include_lib("kernel/include/inet.hrl").
 -include_lib("kernel/src/inet_dns.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2, end_per_testcase/2]).
 -export([basic/1, resolve/1, edns0/1, txt_record/1, files_monitor/1]).
 -export([
@@ -43,10 +44,10 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[basic, resolve, edns0, txt_record, files_monitor,
- gethostbyaddr, gethostbyaddr_v6, gethostbyname,
- gethostbyname_v6, getaddr, getaddr_v6, ipv4_to_ipv6,
- host_and_addr].
+    [basic, resolve, edns0, txt_record, files_monitor,
+     gethostbyaddr, gethostbyaddr_v6, gethostbyname,
+     gethostbyname_v6, getaddr, getaddr_v6, ipv4_to_ipv6,
+     host_and_addr].
 
 groups() -> 
     [].
@@ -58,10 +59,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 zone_dir(basic) ->
     otptest;
diff --git a/lib/kernel/test/inet_sockopt_SUITE.erl b/lib/kernel/test/inet_sockopt_SUITE.erl
index 31910b625c..2c192aa383 100644
--- a/lib/kernel/test/inet_sockopt_SUITE.erl
+++ b/lib/kernel/test/inet_sockopt_SUITE.erl
@@ -48,7 +48,9 @@
 
 -define(C_QUIT,99).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, simple/1, loop_all/1, simple_raw/1, simple_raw_getbin/1, 
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 simple/1, loop_all/1, simple_raw/1, simple_raw_getbin/1, 
 	 doc_examples_raw/1,doc_examples_raw_getbin/1,
 	 large_raw/1,large_raw_getbin/1,combined/1,combined_getbin/1,
 	 type_errors/1]).
@@ -59,10 +61,10 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[simple, loop_all, simple_raw, simple_raw_getbin,
- doc_examples_raw, doc_examples_raw_getbin, large_raw,
- large_raw_getbin, combined, combined_getbin,
- type_errors].
+    [simple, loop_all, simple_raw, simple_raw_getbin,
+     doc_examples_raw, doc_examples_raw_getbin, large_raw,
+     large_raw_getbin, combined, combined_getbin,
+     type_errors].
 
 groups() -> 
     [].
@@ -74,10 +76,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Func, Config) ->
diff --git a/lib/kernel/test/init_SUITE.erl b/lib/kernel/test/init_SUITE.erl
index 8c7dc1bb2f..90f1334f1c 100644
--- a/lib/kernel/test/init_SUITE.erl
+++ b/lib/kernel/test/init_SUITE.erl
@@ -20,7 +20,8 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 
 -export([get_arguments/1, get_argument/1, boot_var/1, restart/1,
 	 get_plain_arguments/1,
@@ -41,9 +42,9 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[get_arguments, get_argument, boot_var,
- get_plain_arguments, restart, get_status, script_id,
- {group, boot}].
+    [get_arguments, get_argument, boot_var,
+     get_plain_arguments, restart, get_status, script_id,
+     {group, boot}].
 
 groups() -> 
     [{boot, [], [boot1, boot2]}].
@@ -55,10 +56,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index 7ef7f80d44..f6fac3983d 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -18,7 +18,9 @@
 %%
 -module(interactive_shell_SUITE).
 -include_lib("test_server/include/test_server.hrl").
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, get_columns_and_rows/1, exit_initial/1, job_control_local/1, 
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 get_columns_and_rows/1, exit_initial/1, job_control_local/1, 
 	 job_control_remote/1,
 	 job_control_remote_noshell/1]).
 
@@ -47,8 +49,8 @@ end_per_testcase(_Func, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[get_columns_and_rows, exit_initial, job_control_local,
- job_control_remote, job_control_remote_noshell].
+    [get_columns_and_rows, exit_initial, job_control_local,
+     job_control_remote, job_control_remote_noshell].
 
 groups() -> 
     [].
@@ -60,10 +62,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %-define(DEBUG,1).
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index 801505e683..02bb3ced08 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -27,7 +27,8 @@
 -define(default_timeout, ?t:minutes(1)).
 
 % Test server specific exports
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 % Test cases must be exported.
@@ -39,7 +40,7 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[app_test].
+    [app_test].
 
 groups() -> 
     [].
@@ -51,10 +52,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Case, Config) ->
diff --git a/lib/kernel/test/kernel_config_SUITE.erl b/lib/kernel/test/kernel_config_SUITE.erl
index a51d1dafd2..554b782797 100644
--- a/lib/kernel/test/kernel_config_SUITE.erl
+++ b/lib/kernel/test/kernel_config_SUITE.erl
@@ -27,16 +27,16 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[sync].
+    [sync].
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_suite(doc) -> [];
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index 06b60871cc..8541170893 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -18,7 +18,8 @@
 %%
 -module(os_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([space_in_cwd/1, quoting/1, space_in_name/1, bad_command/1,
 	 find_executable/1, unix_comment_in_command/1, evil/1]).
 
@@ -27,8 +28,8 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[space_in_cwd, quoting, space_in_name, bad_command,
- find_executable, unix_comment_in_command, evil].
+    [space_in_cwd, quoting, space_in_name, bad_command,
+     find_executable, unix_comment_in_command, evil].
 
 groups() -> 
     [].
diff --git a/lib/kernel/test/pdict_SUITE.erl b/lib/kernel/test/pdict_SUITE.erl
index c296b3b84f..f8091a5d17 100644
--- a/lib/kernel/test/pdict_SUITE.erl
+++ b/lib/kernel/test/pdict_SUITE.erl
@@ -29,7 +29,8 @@
 -define(DEBUGF(A,B), noop).
 -endif.
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 simple/1, complicated/1, heavy/1, info/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 -export([other_process/2]).
@@ -45,7 +46,7 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[simple, complicated, heavy, info].
+    [simple, complicated, heavy, info].
 
 groups() -> 
     [].
@@ -57,10 +58,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 simple(doc) ->
diff --git a/lib/kernel/test/pg2_SUITE.erl b/lib/kernel/test/pg2_SUITE.erl
index 25ce71eb00..048a73b8cb 100644
--- a/lib/kernel/test/pg2_SUITE.erl
+++ b/lib/kernel/test/pg2_SUITE.erl
@@ -24,10 +24,12 @@
 -define(datadir, ?config(data_dir, Config)).
 -define(privdir, ?config(priv_dir, Config)).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -export([
-             otp_7277/1, otp_8259/1, otp_8653/1,
+	 otp_7277/1, otp_8259/1, otp_8653/1,
          compat/1, basic/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
@@ -52,11 +54,11 @@ end_per_testcase(_Case, _Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[{group, tickets}].
+    [{group, tickets}].
 
 groups() -> 
     [{tickets, [],
-  [otp_7277, otp_8259, otp_8653, compat, basic]}].
+      [otp_7277, otp_8259, otp_8653, compat, basic]}].
 
 init_per_suite(Config) ->
     Config.
@@ -65,10 +67,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 
diff --git a/lib/kernel/test/prim_file_SUITE.erl b/lib/kernel/test/prim_file_SUITE.erl
index 881d6396ed..ad259ec2ec 100644
--- a/lib/kernel/test/prim_file_SUITE.erl
+++ b/lib/kernel/test/prim_file_SUITE.erl
@@ -17,9 +17,9 @@
 %% %CopyrightEnd%
 %%
 -module(prim_file_SUITE).
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,
-	init/1, fini/1,
-	read_write_file/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 read_write_file/1]).
 -export([cur_dir_0a/1, cur_dir_0b/1, 
 	 cur_dir_1a/1, cur_dir_1b/1, 
 	 make_del_dir_a/1, make_del_dir_b/1,
@@ -28,25 +28,25 @@
 	 delete_a/1, delete_b/1]).
 -export([ open1/1, modes/1]).
 -export([ 
-	 file_info_basic_file_a/1, file_info_basic_file_b/1,
-	 file_info_basic_directory_a/1, file_info_basic_directory_b/1,
-	 file_info_bad_a/1, file_info_bad_b/1, 
-	 file_info_times_a/1, file_info_times_b/1, 
-	 file_write_file_info_a/1, file_write_file_info_b/1]).
+	  file_info_basic_file_a/1, file_info_basic_file_b/1,
+	  file_info_basic_directory_a/1, file_info_basic_directory_b/1,
+	  file_info_bad_a/1, file_info_bad_b/1, 
+	  file_info_times_a/1, file_info_times_b/1, 
+	  file_write_file_info_a/1, file_write_file_info_b/1]).
 -export([rename_a/1, rename_b/1, 
 	 access/1, truncate/1, datasync/1, sync/1,
 	 read_write/1, pread_write/1, append/1, exclusive/1]).
 -export([ e_delete/1, e_rename/1, e_make_dir/1, e_del_dir/1]).
 
 -export([ read_not_really_compressed/1,
-	 read_compressed/1, write_compressed/1,
-	 compress_errors/1]).
+	  read_compressed/1, write_compressed/1,
+	  compress_errors/1]).
 
 -export([ 
-	 make_link_a/1, make_link_b/1,
-	 read_link_info_for_non_link/1, 
-	 symlinks_a/1, symlinks_b/1,
-	 list_dir_limit/1]).
+	  make_link_a/1, make_link_b/1,
+	  read_link_info_for_non_link/1, 
+	  symlinks_a/1, symlinks_b/1,
+	  list_dir_limit/1]).
 
 -export([advise/1]).
 
@@ -70,50 +70,44 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[read_write_file, {group, dirs}, {group, files},
- delete_a, delete_b, rename_a, rename_b, {group, errors},
- {group, compression}, {group, links}, list_dir_limit].
+    [read_write_file, {group, dirs}, {group, files},
+     delete_a, delete_b, rename_a, rename_b, {group, errors},
+     {group, compression}, {group, links}, list_dir_limit].
 
 groups() -> 
     [{dirs, [],
-  [make_del_dir_a, make_del_dir_b, cur_dir_0a, cur_dir_0b,
-   cur_dir_1a, cur_dir_1b]},
- {files, [],
-  [{group, open}, {group, pos}, {group, file_info},
-   truncate, sync, datasync, advise]},
- {open, [],
-  [open1, modes, close, access, read_write, pread_write,
-   append, exclusive]},
- {pos, [], [pos1, pos2]},
- {file_info, [],
-  [file_info_basic_file_a, file_info_basic_file_b,
-   file_info_basic_directory_a,
-   file_info_basic_directory_b, file_info_bad_a,
-   file_info_bad_b, file_info_times_a, file_info_times_b,
-   file_write_file_info_a, file_write_file_info_b]},
- {errors, [],
-  [e_delete, e_rename, e_make_dir, e_del_dir]},
- {compression, [],
-  [read_compressed, read_not_really_compressed,
-   write_compressed, compress_errors]},
- {links, [],
-  [make_link_a, make_link_b, read_link_info_for_non_link,
-   symlinks_a, symlinks_b]}].
-
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
+      [make_del_dir_a, make_del_dir_b, cur_dir_0a, cur_dir_0b,
+       cur_dir_1a, cur_dir_1b]},
+     {files, [],
+      [{group, open}, {group, pos}, {group, file_info},
+       truncate, sync, datasync, advise]},
+     {open, [],
+      [open1, modes, close, access, read_write, pread_write,
+       append, exclusive]},
+     {pos, [], [pos1, pos2]},
+     {file_info, [],
+      [file_info_basic_file_a, file_info_basic_file_b,
+       file_info_basic_directory_a,
+       file_info_basic_directory_b, file_info_bad_a,
+       file_info_bad_b, file_info_times_a, file_info_times_b,
+       file_write_file_info_a, file_write_file_info_b]},
+     {errors, [],
+      [e_delete, e_rename, e_make_dir, e_del_dir]},
+     {compression, [],
+      [read_compressed, read_not_really_compressed,
+       write_compressed, compress_errors]},
+     {links, [],
+      [make_link_a, make_link_b, read_link_info_for_non_link,
+       symlinks_a, symlinks_b]}].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
-init(Config) when is_list(Config) ->
+init_per_suite(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
 	    Priv = ?config(priv_dir, Config),
@@ -130,7 +124,7 @@ init(Config) when is_list(Config) ->
 	    Config
     end.
 
-fini(Config) when is_list(Config) ->
+end_per_suite(Config) when is_list(Config) ->
     case os:type() of
 	{win32, _} ->
 	    os:cmd("subst z: /d");
diff --git a/lib/kernel/test/ram_file_SUITE.erl b/lib/kernel/test/ram_file_SUITE.erl
index 5d079d5bee..6cda16f1f2 100644
--- a/lib/kernel/test/ram_file_SUITE.erl
+++ b/lib/kernel/test/ram_file_SUITE.erl
@@ -19,7 +19,8 @@
 
 -module(ram_file_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 %% init/1, fini/1,
 	 init_per_testcase/2, end_per_testcase/2]).
 -export([open_modes/1, open_old_modes/1, pread_pwrite/1, position/1,
@@ -37,9 +38,9 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[open_modes, open_old_modes, pread_pwrite, position,
- truncate, sync, get_set_file, compress, uuencode,
- large_file_errors, large_file_light, large_file_heavy].
+    [open_modes, open_old_modes, pread_pwrite, position,
+     truncate, sync, get_set_file, compress, uuencode,
+     large_file_errors, large_file_light, large_file_heavy].
 
 groups() -> 
     [].
@@ -51,10 +52,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
diff --git a/lib/kernel/test/rpc_SUITE.erl b/lib/kernel/test/rpc_SUITE.erl
index 2cced82f4d..6ea2bd194a 100644
--- a/lib/kernel/test/rpc_SUITE.erl
+++ b/lib/kernel/test/rpc_SUITE.erl
@@ -18,7 +18,8 @@
 %%
 -module(rpc_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([call/1, block_call/1, multicall/1, multicall_timeout/1, 
 	 multicall_dies/1, multicall_node_dies/1,
 	 called_dies/1, called_node_dies/1, 
@@ -31,10 +32,10 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[call, block_call, multicall, multicall_timeout,
- multicall_dies, multicall_node_dies, called_dies,
- called_node_dies, called_throws, call_benchmark,
- async_call].
+    [call, block_call, multicall, multicall_timeout,
+     multicall_dies, multicall_node_dies, called_dies,
+     called_node_dies, called_throws, call_benchmark,
+     async_call].
 
 groups() -> 
     [].
@@ -46,10 +47,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 
diff --git a/lib/kernel/test/seq_trace_SUITE.erl b/lib/kernel/test/seq_trace_SUITE.erl
index b66684f13d..7cb67b261a 100644
--- a/lib/kernel/test/seq_trace_SUITE.erl
+++ b/lib/kernel/test/seq_trace_SUITE.erl
@@ -18,7 +18,9 @@
 %%
 -module(seq_trace_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2]).
 -export([token_set_get/1, tracer_set_get/1, print/1,
 	 send/1, distributed_send/1, recv/1, distributed_recv/1,
 	 trace_exit/1, distributed_exit/1, call/1, port/1,
@@ -29,7 +31,7 @@
 	 start_tracer/0, stop_tracer/1, 
 	 do_match_set_seq_token/1, do_gc_seq_token/1, countdown_start/2]).
 
-%-define(line_trace, 1).
+						%-define(line_trace, 1).
 -include_lib("test_server/include/test_server.hrl").
 
 -define(default_timeout, ?t:minutes(1)).
@@ -37,10 +39,10 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[token_set_get, tracer_set_get, print, send,
- distributed_send, recv, distributed_recv, trace_exit,
- distributed_exit, call, port, match_set_seq_token,
- gc_seq_token].
+    [token_set_get, tracer_set_get, print, send,
+     distributed_send, recv, distributed_recv, trace_exit,
+     distributed_exit, call, port, match_set_seq_token,
+     gc_seq_token].
 
 groups() -> 
     [].
@@ -52,10 +54,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Case, Config) ->
diff --git a/lib/kernel/test/wrap_log_reader_SUITE.erl b/lib/kernel/test/wrap_log_reader_SUITE.erl
index a7b63474ec..adf13c2d8f 100644
--- a/lib/kernel/test/wrap_log_reader_SUITE.erl
+++ b/lib/kernel/test/wrap_log_reader_SUITE.erl
@@ -33,7 +33,8 @@
 -define(privdir(Conf), ?config(priv_dir, Conf)).
 -endif.
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
 	 no_file/1,
 	 one_empty/1, one_filled/1,
 	 two_filled/1,
@@ -48,13 +49,13 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[no_file, {group, one}, {group, two}, {group, four},
- {group, wrap}, wrapping, external, error].
+    [no_file, {group, one}, {group, two}, {group, four},
+     {group, wrap}, wrapping, external, error].
 
 groups() -> 
     [{one, [], [one_empty, one_filled]},
- {two, [], [two_filled]}, {four, [], [four_filled]},
- {wrap, [], [wrap_filled]}].
+     {two, [], [two_filled]}, {four, [], [four_filled]},
+     {wrap, [], [wrap_filled]}].
 
 init_per_suite(Config) ->
     Config.
@@ -63,10 +64,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(Func, Config) when is_atom(Func), is_list(Config) ->
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index 9a0fa61faa..6ec38ddc86 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -72,23 +72,23 @@ error(Format, Args, File, Line) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[{group, api}, {group, examples}, {group, func}, smp,
- otp_7359].
+    [{group, api}, {group, examples}, {group, func}, smp,
+     otp_7359].
 
 groups() -> 
     [{api, [],
-  [api_open_close, api_deflateInit,
-   api_deflateSetDictionary, api_deflateReset,
-   api_deflateParams, api_deflate, api_deflateEnd,
-   api_inflateInit, api_inflateSetDictionary,
-   api_inflateSync, api_inflateReset, api_inflate,
-   api_inflateEnd, api_setBufsz, api_getBufsz, api_crc32,
-   api_adler32, api_getQSize, api_un_compress, api_un_zip,
-   api_g_un_zip]},
- {examples, [], [intro]},
- {func, [],
-  [zip_usage, gz_usage, gz_usage2, compress_usage,
-   dictionary_usage, large_deflate, crc, adler]}].
+      [api_open_close, api_deflateInit,
+       api_deflateSetDictionary, api_deflateReset,
+       api_deflateParams, api_deflate, api_deflateEnd,
+       api_inflateInit, api_inflateSetDictionary,
+       api_inflateSync, api_inflateReset, api_inflate,
+       api_inflateEnd, api_setBufsz, api_getBufsz, api_crc32,
+       api_adler32, api_getQSize, api_un_compress, api_un_zip,
+       api_g_un_zip]},
+     {examples, [], [intro]},
+     {func, [],
+      [zip_usage, gz_usage, gz_usage2, compress_usage,
+       dictionary_usage, large_deflate, crc, adler]}].
 
 init_per_suite(Config) ->
     Config.
@@ -97,10 +97,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.